From 2eb7712a9b1165b58b70b6707c957b442d1be62d Mon Sep 17 00:00:00 2001 From: Oz N Tiram Date: Sun, 2 Oct 2022 09:46:53 +0200 Subject: [PATCH 1/6] Remove vendored six library Fix #5187. --- pipenv/vendor/six.LICENSE | 18 - pipenv/vendor/six.py | 998 -------------------------------------- pipenv/vendor/vendor.txt | 1 - 3 files changed, 1017 deletions(-) delete mode 100644 pipenv/vendor/six.LICENSE delete mode 100644 pipenv/vendor/six.py diff --git a/pipenv/vendor/six.LICENSE b/pipenv/vendor/six.LICENSE deleted file mode 100644 index de663311..00000000 --- a/pipenv/vendor/six.LICENSE +++ /dev/null @@ -1,18 +0,0 @@ -Copyright (c) 2010-2020 Benjamin Peterson - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/pipenv/vendor/six.py b/pipenv/vendor/six.py deleted file mode 100644 index 4e15675d..00000000 --- a/pipenv/vendor/six.py +++ /dev/null @@ -1,998 +0,0 @@ -# Copyright (c) 2010-2020 Benjamin Peterson -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -"""Utilities for writing code that runs on Python 2 and 3""" - -from __future__ import absolute_import - -import functools -import itertools -import operator -import sys -import types - -__author__ = "Benjamin Peterson " -__version__ = "1.16.0" - - -# Useful for very coarse version differentiation. -PY2 = sys.version_info[0] == 2 -PY3 = sys.version_info[0] == 3 -PY34 = sys.version_info[0:2] >= (3, 4) - -if PY3: - string_types = str, - integer_types = int, - class_types = type, - text_type = str - binary_type = bytes - - MAXSIZE = sys.maxsize -else: - string_types = basestring, - integer_types = (int, long) - class_types = (type, types.ClassType) - text_type = unicode - binary_type = str - - if sys.platform.startswith("java"): - # Jython always uses 32 bits. - MAXSIZE = int((1 << 31) - 1) - else: - # It's possible to have sizeof(long) != sizeof(Py_ssize_t). - class X(object): - - def __len__(self): - return 1 << 31 - try: - len(X()) - except OverflowError: - # 32-bit - MAXSIZE = int((1 << 31) - 1) - else: - # 64-bit - MAXSIZE = int((1 << 63) - 1) - del X - -if PY34: - from importlib.util import spec_from_loader -else: - spec_from_loader = None - - -def _add_doc(func, doc): - """Add documentation to a function.""" - func.__doc__ = doc - - -def _import_module(name): - """Import module, returning the module after the last dot.""" - __import__(name) - return sys.modules[name] - - -class _LazyDescr(object): - - def __init__(self, name): - self.name = name - - def __get__(self, obj, tp): - result = self._resolve() - setattr(obj, self.name, result) # Invokes __set__. - try: - # This is a bit ugly, but it avoids running this again by - # removing this descriptor. - delattr(obj.__class__, self.name) - except AttributeError: - pass - return result - - -class MovedModule(_LazyDescr): - - def __init__(self, name, old, new=None): - super(MovedModule, self).__init__(name) - if PY3: - if new is None: - new = name - self.mod = new - else: - self.mod = old - - def _resolve(self): - return _import_module(self.mod) - - def __getattr__(self, attr): - _module = self._resolve() - value = getattr(_module, attr) - setattr(self, attr, value) - return value - - -class _LazyModule(types.ModuleType): - - def __init__(self, name): - super(_LazyModule, self).__init__(name) - self.__doc__ = self.__class__.__doc__ - - def __dir__(self): - attrs = ["__doc__", "__name__"] - attrs += [attr.name for attr in self._moved_attributes] - return attrs - - # Subclasses should override this - _moved_attributes = [] - - -class MovedAttribute(_LazyDescr): - - def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None): - super(MovedAttribute, self).__init__(name) - if PY3: - if new_mod is None: - new_mod = name - self.mod = new_mod - if new_attr is None: - if old_attr is None: - new_attr = name - else: - new_attr = old_attr - self.attr = new_attr - else: - self.mod = old_mod - if old_attr is None: - old_attr = name - self.attr = old_attr - - def _resolve(self): - module = _import_module(self.mod) - return getattr(module, self.attr) - - -class _SixMetaPathImporter(object): - - """ - A meta path importer to import six.moves and its submodules. - - This class implements a PEP302 finder and loader. It should be compatible - with Python 2.5 and all existing versions of Python3 - """ - - def __init__(self, six_module_name): - self.name = six_module_name - self.known_modules = {} - - def _add_module(self, mod, *fullnames): - for fullname in fullnames: - self.known_modules[self.name + "." + fullname] = mod - - def _get_module(self, fullname): - return self.known_modules[self.name + "." + fullname] - - def find_module(self, fullname, path=None): - if fullname in self.known_modules: - return self - return None - - def find_spec(self, fullname, path, target=None): - if fullname in self.known_modules: - return spec_from_loader(fullname, self) - return None - - def __get_module(self, fullname): - try: - return self.known_modules[fullname] - except KeyError: - raise ImportError("This loader does not know module " + fullname) - - def load_module(self, fullname): - try: - # in case of a reload - return sys.modules[fullname] - except KeyError: - pass - mod = self.__get_module(fullname) - if isinstance(mod, MovedModule): - mod = mod._resolve() - else: - mod.__loader__ = self - sys.modules[fullname] = mod - return mod - - def is_package(self, fullname): - """ - Return true, if the named module is a package. - - We need this method to get correct spec objects with - Python 3.4 (see PEP451) - """ - return hasattr(self.__get_module(fullname), "__path__") - - def get_code(self, fullname): - """Return None - - Required, if is_package is implemented""" - self.__get_module(fullname) # eventually raises ImportError - return None - get_source = get_code # same as get_code - - def create_module(self, spec): - return self.load_module(spec.name) - - def exec_module(self, module): - pass - -_importer = _SixMetaPathImporter(__name__) - - -class _MovedItems(_LazyModule): - - """Lazy loading of moved objects""" - __path__ = [] # mark as package - - -_moved_attributes = [ - MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"), - MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"), - MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"), - MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"), - MovedAttribute("intern", "__builtin__", "sys"), - MovedAttribute("map", "itertools", "builtins", "imap", "map"), - MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"), - MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"), - MovedAttribute("getoutput", "commands", "subprocess"), - MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"), - MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"), - MovedAttribute("reduce", "__builtin__", "functools"), - MovedAttribute("shlex_quote", "pipes", "shlex", "quote"), - MovedAttribute("StringIO", "StringIO", "io"), - MovedAttribute("UserDict", "UserDict", "collections"), - MovedAttribute("UserList", "UserList", "collections"), - MovedAttribute("UserString", "UserString", "collections"), - MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"), - MovedAttribute("zip", "itertools", "builtins", "izip", "zip"), - MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"), - MovedModule("builtins", "__builtin__"), - MovedModule("configparser", "ConfigParser"), - MovedModule("collections_abc", "collections", "collections.abc" if sys.version_info >= (3, 3) else "collections"), - MovedModule("copyreg", "copy_reg"), - MovedModule("dbm_gnu", "gdbm", "dbm.gnu"), - MovedModule("dbm_ndbm", "dbm", "dbm.ndbm"), - MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread" if sys.version_info < (3, 9) else "_thread"), - MovedModule("http_cookiejar", "cookielib", "http.cookiejar"), - MovedModule("http_cookies", "Cookie", "http.cookies"), - MovedModule("html_entities", "htmlentitydefs", "html.entities"), - MovedModule("html_parser", "HTMLParser", "html.parser"), - MovedModule("http_client", "httplib", "http.client"), - MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"), - MovedModule("email_mime_image", "email.MIMEImage", "email.mime.image"), - MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"), - MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"), - MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"), - MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"), - MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"), - MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"), - MovedModule("cPickle", "cPickle", "pickle"), - MovedModule("queue", "Queue"), - MovedModule("reprlib", "repr"), - MovedModule("socketserver", "SocketServer"), - MovedModule("_thread", "thread", "_thread"), - MovedModule("tkinter", "Tkinter"), - MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"), - MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"), - MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"), - MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"), - MovedModule("tkinter_tix", "Tix", "tkinter.tix"), - MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"), - MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"), - MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"), - MovedModule("tkinter_colorchooser", "tkColorChooser", - "tkinter.colorchooser"), - MovedModule("tkinter_commondialog", "tkCommonDialog", - "tkinter.commondialog"), - MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"), - MovedModule("tkinter_font", "tkFont", "tkinter.font"), - MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"), - MovedModule("tkinter_tksimpledialog", "tkSimpleDialog", - "tkinter.simpledialog"), - MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"), - MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"), - MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"), - MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"), - MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"), - MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"), -] -# Add windows specific modules. -if sys.platform == "win32": - _moved_attributes += [ - MovedModule("winreg", "_winreg"), - ] - -for attr in _moved_attributes: - setattr(_MovedItems, attr.name, attr) - if isinstance(attr, MovedModule): - _importer._add_module(attr, "moves." + attr.name) -del attr - -_MovedItems._moved_attributes = _moved_attributes - -moves = _MovedItems(__name__ + ".moves") -_importer._add_module(moves, "moves") - - -class Module_six_moves_urllib_parse(_LazyModule): - - """Lazy loading of moved objects in six.moves.urllib_parse""" - - -_urllib_parse_moved_attributes = [ - MovedAttribute("ParseResult", "urlparse", "urllib.parse"), - MovedAttribute("SplitResult", "urlparse", "urllib.parse"), - MovedAttribute("parse_qs", "urlparse", "urllib.parse"), - MovedAttribute("parse_qsl", "urlparse", "urllib.parse"), - MovedAttribute("urldefrag", "urlparse", "urllib.parse"), - MovedAttribute("urljoin", "urlparse", "urllib.parse"), - MovedAttribute("urlparse", "urlparse", "urllib.parse"), - MovedAttribute("urlsplit", "urlparse", "urllib.parse"), - MovedAttribute("urlunparse", "urlparse", "urllib.parse"), - MovedAttribute("urlunsplit", "urlparse", "urllib.parse"), - MovedAttribute("quote", "urllib", "urllib.parse"), - MovedAttribute("quote_plus", "urllib", "urllib.parse"), - MovedAttribute("unquote", "urllib", "urllib.parse"), - MovedAttribute("unquote_plus", "urllib", "urllib.parse"), - MovedAttribute("unquote_to_bytes", "urllib", "urllib.parse", "unquote", "unquote_to_bytes"), - MovedAttribute("urlencode", "urllib", "urllib.parse"), - MovedAttribute("splitquery", "urllib", "urllib.parse"), - MovedAttribute("splittag", "urllib", "urllib.parse"), - MovedAttribute("splituser", "urllib", "urllib.parse"), - MovedAttribute("splitvalue", "urllib", "urllib.parse"), - MovedAttribute("uses_fragment", "urlparse", "urllib.parse"), - MovedAttribute("uses_netloc", "urlparse", "urllib.parse"), - MovedAttribute("uses_params", "urlparse", "urllib.parse"), - MovedAttribute("uses_query", "urlparse", "urllib.parse"), - MovedAttribute("uses_relative", "urlparse", "urllib.parse"), -] -for attr in _urllib_parse_moved_attributes: - setattr(Module_six_moves_urllib_parse, attr.name, attr) -del attr - -Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes - -_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"), - "moves.urllib_parse", "moves.urllib.parse") - - -class Module_six_moves_urllib_error(_LazyModule): - - """Lazy loading of moved objects in six.moves.urllib_error""" - - -_urllib_error_moved_attributes = [ - MovedAttribute("URLError", "urllib2", "urllib.error"), - MovedAttribute("HTTPError", "urllib2", "urllib.error"), - MovedAttribute("ContentTooShortError", "urllib", "urllib.error"), -] -for attr in _urllib_error_moved_attributes: - setattr(Module_six_moves_urllib_error, attr.name, attr) -del attr - -Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes - -_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"), - "moves.urllib_error", "moves.urllib.error") - - -class Module_six_moves_urllib_request(_LazyModule): - - """Lazy loading of moved objects in six.moves.urllib_request""" - - -_urllib_request_moved_attributes = [ - MovedAttribute("urlopen", "urllib2", "urllib.request"), - MovedAttribute("install_opener", "urllib2", "urllib.request"), - MovedAttribute("build_opener", "urllib2", "urllib.request"), - MovedAttribute("pathname2url", "urllib", "urllib.request"), - MovedAttribute("url2pathname", "urllib", "urllib.request"), - MovedAttribute("getproxies", "urllib", "urllib.request"), - MovedAttribute("Request", "urllib2", "urllib.request"), - MovedAttribute("OpenerDirector", "urllib2", "urllib.request"), - MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"), - MovedAttribute("ProxyHandler", "urllib2", "urllib.request"), - MovedAttribute("BaseHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"), - MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"), - MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"), - MovedAttribute("FileHandler", "urllib2", "urllib.request"), - MovedAttribute("FTPHandler", "urllib2", "urllib.request"), - MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"), - MovedAttribute("UnknownHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"), - MovedAttribute("urlretrieve", "urllib", "urllib.request"), - MovedAttribute("urlcleanup", "urllib", "urllib.request"), - MovedAttribute("URLopener", "urllib", "urllib.request"), - MovedAttribute("FancyURLopener", "urllib", "urllib.request"), - MovedAttribute("proxy_bypass", "urllib", "urllib.request"), - MovedAttribute("parse_http_list", "urllib2", "urllib.request"), - MovedAttribute("parse_keqv_list", "urllib2", "urllib.request"), -] -for attr in _urllib_request_moved_attributes: - setattr(Module_six_moves_urllib_request, attr.name, attr) -del attr - -Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes - -_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"), - "moves.urllib_request", "moves.urllib.request") - - -class Module_six_moves_urllib_response(_LazyModule): - - """Lazy loading of moved objects in six.moves.urllib_response""" - - -_urllib_response_moved_attributes = [ - MovedAttribute("addbase", "urllib", "urllib.response"), - MovedAttribute("addclosehook", "urllib", "urllib.response"), - MovedAttribute("addinfo", "urllib", "urllib.response"), - MovedAttribute("addinfourl", "urllib", "urllib.response"), -] -for attr in _urllib_response_moved_attributes: - setattr(Module_six_moves_urllib_response, attr.name, attr) -del attr - -Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes - -_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"), - "moves.urllib_response", "moves.urllib.response") - - -class Module_six_moves_urllib_robotparser(_LazyModule): - - """Lazy loading of moved objects in six.moves.urllib_robotparser""" - - -_urllib_robotparser_moved_attributes = [ - MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"), -] -for attr in _urllib_robotparser_moved_attributes: - setattr(Module_six_moves_urllib_robotparser, attr.name, attr) -del attr - -Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes - -_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"), - "moves.urllib_robotparser", "moves.urllib.robotparser") - - -class Module_six_moves_urllib(types.ModuleType): - - """Create a six.moves.urllib namespace that resembles the Python 3 namespace""" - __path__ = [] # mark as package - parse = _importer._get_module("moves.urllib_parse") - error = _importer._get_module("moves.urllib_error") - request = _importer._get_module("moves.urllib_request") - response = _importer._get_module("moves.urllib_response") - robotparser = _importer._get_module("moves.urllib_robotparser") - - def __dir__(self): - return ['parse', 'error', 'request', 'response', 'robotparser'] - -_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"), - "moves.urllib") - - -def add_move(move): - """Add an item to six.moves.""" - setattr(_MovedItems, move.name, move) - - -def remove_move(name): - """Remove item from six.moves.""" - try: - delattr(_MovedItems, name) - except AttributeError: - try: - del moves.__dict__[name] - except KeyError: - raise AttributeError("no such move, %r" % (name,)) - - -if PY3: - _meth_func = "__func__" - _meth_self = "__self__" - - _func_closure = "__closure__" - _func_code = "__code__" - _func_defaults = "__defaults__" - _func_globals = "__globals__" -else: - _meth_func = "im_func" - _meth_self = "im_self" - - _func_closure = "func_closure" - _func_code = "func_code" - _func_defaults = "func_defaults" - _func_globals = "func_globals" - - -try: - advance_iterator = next -except NameError: - def advance_iterator(it): - return it.next() -next = advance_iterator - - -try: - callable = callable -except NameError: - def callable(obj): - return any("__call__" in klass.__dict__ for klass in type(obj).__mro__) - - -if PY3: - def get_unbound_function(unbound): - return unbound - - create_bound_method = types.MethodType - - def create_unbound_method(func, cls): - return func - - Iterator = object -else: - def get_unbound_function(unbound): - return unbound.im_func - - def create_bound_method(func, obj): - return types.MethodType(func, obj, obj.__class__) - - def create_unbound_method(func, cls): - return types.MethodType(func, None, cls) - - class Iterator(object): - - def next(self): - return type(self).__next__(self) - - callable = callable -_add_doc(get_unbound_function, - """Get the function out of a possibly unbound function""") - - -get_method_function = operator.attrgetter(_meth_func) -get_method_self = operator.attrgetter(_meth_self) -get_function_closure = operator.attrgetter(_func_closure) -get_function_code = operator.attrgetter(_func_code) -get_function_defaults = operator.attrgetter(_func_defaults) -get_function_globals = operator.attrgetter(_func_globals) - - -if PY3: - def iterkeys(d, **kw): - return iter(d.keys(**kw)) - - def itervalues(d, **kw): - return iter(d.values(**kw)) - - def iteritems(d, **kw): - return iter(d.items(**kw)) - - def iterlists(d, **kw): - return iter(d.lists(**kw)) - - viewkeys = operator.methodcaller("keys") - - viewvalues = operator.methodcaller("values") - - viewitems = operator.methodcaller("items") -else: - def iterkeys(d, **kw): - return d.iterkeys(**kw) - - def itervalues(d, **kw): - return d.itervalues(**kw) - - def iteritems(d, **kw): - return d.iteritems(**kw) - - def iterlists(d, **kw): - return d.iterlists(**kw) - - viewkeys = operator.methodcaller("viewkeys") - - viewvalues = operator.methodcaller("viewvalues") - - viewitems = operator.methodcaller("viewitems") - -_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.") -_add_doc(itervalues, "Return an iterator over the values of a dictionary.") -_add_doc(iteritems, - "Return an iterator over the (key, value) pairs of a dictionary.") -_add_doc(iterlists, - "Return an iterator over the (key, [values]) pairs of a dictionary.") - - -if PY3: - def b(s): - return s.encode("latin-1") - - def u(s): - return s - unichr = chr - import struct - int2byte = struct.Struct(">B").pack - del struct - byte2int = operator.itemgetter(0) - indexbytes = operator.getitem - iterbytes = iter - import io - StringIO = io.StringIO - BytesIO = io.BytesIO - del io - _assertCountEqual = "assertCountEqual" - if sys.version_info[1] <= 1: - _assertRaisesRegex = "assertRaisesRegexp" - _assertRegex = "assertRegexpMatches" - _assertNotRegex = "assertNotRegexpMatches" - else: - _assertRaisesRegex = "assertRaisesRegex" - _assertRegex = "assertRegex" - _assertNotRegex = "assertNotRegex" -else: - def b(s): - return s - # Workaround for standalone backslash - - def u(s): - return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape") - unichr = unichr - int2byte = chr - - def byte2int(bs): - return ord(bs[0]) - - def indexbytes(buf, i): - return ord(buf[i]) - iterbytes = functools.partial(itertools.imap, ord) - import StringIO - StringIO = BytesIO = StringIO.StringIO - _assertCountEqual = "assertItemsEqual" - _assertRaisesRegex = "assertRaisesRegexp" - _assertRegex = "assertRegexpMatches" - _assertNotRegex = "assertNotRegexpMatches" -_add_doc(b, """Byte literal""") -_add_doc(u, """Text literal""") - - -def assertCountEqual(self, *args, **kwargs): - return getattr(self, _assertCountEqual)(*args, **kwargs) - - -def assertRaisesRegex(self, *args, **kwargs): - return getattr(self, _assertRaisesRegex)(*args, **kwargs) - - -def assertRegex(self, *args, **kwargs): - return getattr(self, _assertRegex)(*args, **kwargs) - - -def assertNotRegex(self, *args, **kwargs): - return getattr(self, _assertNotRegex)(*args, **kwargs) - - -if PY3: - exec_ = getattr(moves.builtins, "exec") - - def reraise(tp, value, tb=None): - try: - if value is None: - value = tp() - if value.__traceback__ is not tb: - raise value.with_traceback(tb) - raise value - finally: - value = None - tb = None - -else: - def exec_(_code_, _globs_=None, _locs_=None): - """Execute code in a namespace.""" - if _globs_ is None: - frame = sys._getframe(1) - _globs_ = frame.f_globals - if _locs_ is None: - _locs_ = frame.f_locals - del frame - elif _locs_ is None: - _locs_ = _globs_ - exec("""exec _code_ in _globs_, _locs_""") - - exec_("""def reraise(tp, value, tb=None): - try: - raise tp, value, tb - finally: - tb = None -""") - - -if sys.version_info[:2] > (3,): - exec_("""def raise_from(value, from_value): - try: - raise value from from_value - finally: - value = None -""") -else: - def raise_from(value, from_value): - raise value - - -print_ = getattr(moves.builtins, "print", None) -if print_ is None: - def print_(*args, **kwargs): - """The new-style print function for Python 2.4 and 2.5.""" - fp = kwargs.pop("file", sys.stdout) - if fp is None: - return - - def write(data): - if not isinstance(data, basestring): - data = str(data) - # If the file has an encoding, encode unicode with it. - if (isinstance(fp, file) and - isinstance(data, unicode) and - fp.encoding is not None): - errors = getattr(fp, "errors", None) - if errors is None: - errors = "strict" - data = data.encode(fp.encoding, errors) - fp.write(data) - want_unicode = False - sep = kwargs.pop("sep", None) - if sep is not None: - if isinstance(sep, unicode): - want_unicode = True - elif not isinstance(sep, str): - raise TypeError("sep must be None or a string") - end = kwargs.pop("end", None) - if end is not None: - if isinstance(end, unicode): - want_unicode = True - elif not isinstance(end, str): - raise TypeError("end must be None or a string") - if kwargs: - raise TypeError("invalid keyword arguments to print()") - if not want_unicode: - for arg in args: - if isinstance(arg, unicode): - want_unicode = True - break - if want_unicode: - newline = unicode("\n") - space = unicode(" ") - else: - newline = "\n" - space = " " - if sep is None: - sep = space - if end is None: - end = newline - for i, arg in enumerate(args): - if i: - write(sep) - write(arg) - write(end) -if sys.version_info[:2] < (3, 3): - _print = print_ - - def print_(*args, **kwargs): - fp = kwargs.get("file", sys.stdout) - flush = kwargs.pop("flush", False) - _print(*args, **kwargs) - if flush and fp is not None: - fp.flush() - -_add_doc(reraise, """Reraise an exception.""") - -if sys.version_info[0:2] < (3, 4): - # This does exactly the same what the :func:`py3:functools.update_wrapper` - # function does on Python versions after 3.2. It sets the ``__wrapped__`` - # attribute on ``wrapper`` object and it doesn't raise an error if any of - # the attributes mentioned in ``assigned`` and ``updated`` are missing on - # ``wrapped`` object. - def _update_wrapper(wrapper, wrapped, - assigned=functools.WRAPPER_ASSIGNMENTS, - updated=functools.WRAPPER_UPDATES): - for attr in assigned: - try: - value = getattr(wrapped, attr) - except AttributeError: - continue - else: - setattr(wrapper, attr, value) - for attr in updated: - getattr(wrapper, attr).update(getattr(wrapped, attr, {})) - wrapper.__wrapped__ = wrapped - return wrapper - _update_wrapper.__doc__ = functools.update_wrapper.__doc__ - - def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS, - updated=functools.WRAPPER_UPDATES): - return functools.partial(_update_wrapper, wrapped=wrapped, - assigned=assigned, updated=updated) - wraps.__doc__ = functools.wraps.__doc__ - -else: - wraps = functools.wraps - - -def with_metaclass(meta, *bases): - """Create a base class with a metaclass.""" - # This requires a bit of explanation: the basic idea is to make a dummy - # metaclass for one level of class instantiation that replaces itself with - # the actual metaclass. - class metaclass(type): - - def __new__(cls, name, this_bases, d): - if sys.version_info[:2] >= (3, 7): - # This version introduced PEP 560 that requires a bit - # of extra care (we mimic what is done by __build_class__). - resolved_bases = types.resolve_bases(bases) - if resolved_bases is not bases: - d['__orig_bases__'] = bases - else: - resolved_bases = bases - return meta(name, resolved_bases, d) - - @classmethod - def __prepare__(cls, name, this_bases): - return meta.__prepare__(name, bases) - return type.__new__(metaclass, 'temporary_class', (), {}) - - -def add_metaclass(metaclass): - """Class decorator for creating a class with a metaclass.""" - def wrapper(cls): - orig_vars = cls.__dict__.copy() - slots = orig_vars.get('__slots__') - if slots is not None: - if isinstance(slots, str): - slots = [slots] - for slots_var in slots: - orig_vars.pop(slots_var) - orig_vars.pop('__dict__', None) - orig_vars.pop('__weakref__', None) - if hasattr(cls, '__qualname__'): - orig_vars['__qualname__'] = cls.__qualname__ - return metaclass(cls.__name__, cls.__bases__, orig_vars) - return wrapper - - -def ensure_binary(s, encoding='utf-8', errors='strict'): - """Coerce **s** to six.binary_type. - - For Python 2: - - `unicode` -> encoded to `str` - - `str` -> `str` - - For Python 3: - - `str` -> encoded to `bytes` - - `bytes` -> `bytes` - """ - if isinstance(s, binary_type): - return s - if isinstance(s, text_type): - return s.encode(encoding, errors) - raise TypeError("not expecting type '%s'" % type(s)) - - -def ensure_str(s, encoding='utf-8', errors='strict'): - """Coerce *s* to `str`. - - For Python 2: - - `unicode` -> encoded to `str` - - `str` -> `str` - - For Python 3: - - `str` -> `str` - - `bytes` -> decoded to `str` - """ - # Optimization: Fast return for the common case. - if type(s) is str: - return s - if PY2 and isinstance(s, text_type): - return s.encode(encoding, errors) - elif PY3 and isinstance(s, binary_type): - return s.decode(encoding, errors) - elif not isinstance(s, (text_type, binary_type)): - raise TypeError("not expecting type '%s'" % type(s)) - return s - - -def ensure_text(s, encoding='utf-8', errors='strict'): - """Coerce *s* to six.text_type. - - For Python 2: - - `unicode` -> `unicode` - - `str` -> `unicode` - - For Python 3: - - `str` -> `str` - - `bytes` -> decoded to `str` - """ - if isinstance(s, binary_type): - return s.decode(encoding, errors) - elif isinstance(s, text_type): - return s - else: - raise TypeError("not expecting type '%s'" % type(s)) - - -def python_2_unicode_compatible(klass): - """ - A class decorator that defines __unicode__ and __str__ methods under Python 2. - Under Python 3 it does nothing. - - To support Python 2 and 3 with a single code base, define a __str__ method - returning text and apply this decorator to the class. - """ - if PY2: - if '__str__' not in klass.__dict__: - raise ValueError("@python_2_unicode_compatible cannot be applied " - "to %s because it doesn't define __str__()." % - klass.__name__) - klass.__unicode__ = klass.__str__ - klass.__str__ = lambda self: self.__unicode__().encode('utf-8') - return klass - - -# Complete the moves implementation. -# This code is at the end of this module to speed up module loading. -# Turn this module into a package. -__path__ = [] # required for PEP 302 and PEP 451 -__package__ = __name__ # see PEP 366 @ReservedAssignment -if globals().get("__spec__") is not None: - __spec__.submodule_search_locations = [] # PEP 451 @UndefinedVariable -# Remove other six meta path importers, since they cause problems. This can -# happen if six is removed from sys.modules and then reloaded. (Setuptools does -# this for some reason.) -if sys.meta_path: - for i, importer in enumerate(sys.meta_path): - # Here's some real nastiness: Another "instance" of the six module might - # be floating around. Therefore, we can't use isinstance() to check for - # the six meta path importer, since the other six instance will have - # inserted an importer with different class. - if (type(importer).__name__ == "_SixMetaPathImporter" and - importer.name == __name__): - del sys.meta_path[i] - break - del i, importer -# Finally, add the importer to the meta path import hook. -sys.meta_path.append(_importer) diff --git a/pipenv/vendor/vendor.txt b/pipenv/vendor/vendor.txt index fc9e1829..0238665b 100644 --- a/pipenv/vendor/vendor.txt +++ b/pipenv/vendor/vendor.txt @@ -19,7 +19,6 @@ python-dotenv==0.19.0 pythonfinder==1.3.1 requirementslib==2.0.3 shellingham==1.5.0 -six==1.16.0 termcolor==1.1.0 toml==0.10.2 tomli==1.1.0 From 181b0c64eff23cdcebc837a26effb136573bd9a6 Mon Sep 17 00:00:00 2001 From: Oz N Tiram Date: Sun, 2 Oct 2022 09:50:46 +0200 Subject: [PATCH 2/6] Add new fragment for dropping six --- news/5187.vendor.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/5187.vendor.rst diff --git a/news/5187.vendor.rst b/news/5187.vendor.rst new file mode 100644 index 00000000..84be73c0 --- /dev/null +++ b/news/5187.vendor.rst @@ -0,0 +1 @@ +Drop vendored six - we no longer depend on this library, as we migrated from pipfile to plette. From 9bc26b056f0dcb1fad284735d2c7788e9d97e0fc Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Sun, 2 Oct 2022 09:44:55 -0400 Subject: [PATCH 3/6] Prefer to use the lockfile sources if available since this is used in install phase (#5380) * Prefer to use the lockfile sources if available since this is used in install phase. * Add news fragment. --- news/5380.bugfix.rst | 1 + pipenv/utils/indexes.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 news/5380.bugfix.rst diff --git a/news/5380.bugfix.rst b/news/5380.bugfix.rst new file mode 100644 index 00000000..7f4dcc92 --- /dev/null +++ b/news/5380.bugfix.rst @@ -0,0 +1 @@ +Prefer to use the lockfile sources if available during the install phase. diff --git a/pipenv/utils/indexes.py b/pipenv/utils/indexes.py index f2770adf..667c6d7e 100644 --- a/pipenv/utils/indexes.py +++ b/pipenv/utils/indexes.py @@ -84,12 +84,12 @@ def get_source_list( if not sources or extra_src["url"] != sources[0]["url"]: sources.append(extra_src) - for source in project.pipfile_sources: + for source in project.sources: if not sources or source["url"] != sources[0]["url"]: sources.append(source) if not sources: - sources = project.pipfile_sources[:] + sources = project.sources[:] if pypi_mirror: sources = [ create_mirror_source(pypi_mirror) if is_pypi_url(source["url"]) else source From 047d828fcf15954cb6f62b8a476e58f0b0c9f07d Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Sun, 2 Oct 2022 09:46:31 -0400 Subject: [PATCH 4/6] Prep to vendor in latest wheel version. --- pipenv/vendor/vendor.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipenv/vendor/vendor.txt b/pipenv/vendor/vendor.txt index 0238665b..b8def370 100644 --- a/pipenv/vendor/vendor.txt +++ b/pipenv/vendor/vendor.txt @@ -24,5 +24,5 @@ toml==0.10.2 tomli==1.1.0 tomlkit==0.9.2 vistir==0.6.1 -wheel==0.36.2 +wheel==0.37.1 yaspin==2.0.0 From c0dcc4ad83b3a9a5a88b1fb58a237de37fe95929 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Sun, 2 Oct 2022 09:55:47 -0400 Subject: [PATCH 5/6] Vendor in latest wheel version and add missing license file. --- .../patched/pip/_vendor/pkg_resources/LICENSE | 19 +++++++++ pipenv/vendor/wheel/__init__.py | 2 +- pipenv/vendor/wheel/cli/pack.py | 5 ++- pipenv/vendor/wheel/macosx_libfile.py | 4 +- .../vendor/wheel/vendored/packaging/tags.py | 24 ++++++++--- pipenv/vendor/wheel/wheelfile.py | 42 ++++++++++++------- 6 files changed, 72 insertions(+), 24 deletions(-) create mode 100644 pipenv/patched/pip/_vendor/pkg_resources/LICENSE diff --git a/pipenv/patched/pip/_vendor/pkg_resources/LICENSE b/pipenv/patched/pip/_vendor/pkg_resources/LICENSE new file mode 100644 index 00000000..6e0693b4 --- /dev/null +++ b/pipenv/patched/pip/_vendor/pkg_resources/LICENSE @@ -0,0 +1,19 @@ +Copyright (C) 2016 Jason R Coombs + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/pipenv/vendor/wheel/__init__.py b/pipenv/vendor/wheel/__init__.py index 349a8f7b..a4b38359 100644 --- a/pipenv/vendor/wheel/__init__.py +++ b/pipenv/vendor/wheel/__init__.py @@ -1 +1 @@ -__version__ = '0.36.2' +__version__ = '0.37.1' diff --git a/pipenv/vendor/wheel/cli/pack.py b/pipenv/vendor/wheel/cli/pack.py index 762da308..6a8331c9 100644 --- a/pipenv/vendor/wheel/cli/pack.py +++ b/pipenv/vendor/wheel/cli/pack.py @@ -57,9 +57,12 @@ def pack(directory, dest_dir, build_number): replacement = ('Build: %s\r\n' % build_number).encode('ascii') if build_number else b'' with open(wheel_file_path, 'rb+') as f: wheel_file_content = f.read() - if not BUILD_NUM_RE.subn(replacement, wheel_file_content)[1]: + wheel_file_content, num_replaced = BUILD_NUM_RE.subn(replacement, + wheel_file_content) + if not num_replaced: wheel_file_content += replacement + f.seek(0) f.truncate() f.write(wheel_file_content) diff --git a/pipenv/vendor/wheel/macosx_libfile.py b/pipenv/vendor/wheel/macosx_libfile.py index 8918039f..39006fb0 100644 --- a/pipenv/vendor/wheel/macosx_libfile.py +++ b/pipenv/vendor/wheel/macosx_libfile.py @@ -28,7 +28,7 @@ because them contains information about minimal system version. Important remarks: - For fat files this implementation looks for maximum number version. - It not check if it is 32 or 64 and do not compare it with currently builded package. + It not check if it is 32 or 64 and do not compare it with currently built package. So it is possible to false report higher version that needed. - All structures signatures are taken form macosx header files. - I think that binary format will be more stable than `otool` output. @@ -279,7 +279,7 @@ def extract_macosx_min_system_version(path_to_lib): # Xcode will not set the deployment target below 11.0.0 # for the arm64 architecture. Ignore the arm64 deployment # in fat binaries when the target is 11.0.0, that way - # the other architetures can select a lower deployment + # the other architectures can select a lower deployment # target. # This is safe because there is no arm64 variant for # macOS 10.15 or earlier. diff --git a/pipenv/vendor/wheel/vendored/packaging/tags.py b/pipenv/vendor/wheel/vendored/packaging/tags.py index 3306c690..c2a140c2 100644 --- a/pipenv/vendor/wheel/vendored/packaging/tags.py +++ b/pipenv/vendor/wheel/vendored/packaging/tags.py @@ -458,14 +458,28 @@ def mac_platforms(version=None, arch=None): major=major_version, minor=0, binary_format=binary_format ) - if version >= (11, 0) and arch == "x86_64": + if version >= (11, 0): # Mac OS 11 on x86_64 is compatible with binaries from previous releases. # Arm64 support was introduced in 11.0, so no Arm binaries from previous # releases exist. - for minor_version in range(16, 3, -1): - compat_version = 10, minor_version - binary_formats = _mac_binary_formats(compat_version, arch) - for binary_format in binary_formats: + # + # However, the "universal2" binary format can have a + # macOS version earlier than 11.0 when the x86_64 part of the binary supports + # that version of macOS. + if arch == "x86_64": + for minor_version in range(16, 3, -1): + compat_version = 10, minor_version + binary_formats = _mac_binary_formats(compat_version, arch) + for binary_format in binary_formats: + yield "macosx_{major}_{minor}_{binary_format}".format( + major=compat_version[0], + minor=compat_version[1], + binary_format=binary_format, + ) + else: + for minor_version in range(16, 3, -1): + compat_version = 10, minor_version + binary_format = "universal2" yield "macosx_{major}_{minor}_{binary_format}".format( major=compat_version[0], minor=compat_version[1], diff --git a/pipenv/vendor/wheel/wheelfile.py b/pipenv/vendor/wheel/wheelfile.py index d29c0823..a17cff43 100644 --- a/pipenv/vendor/wheel/wheelfile.py +++ b/pipenv/vendor/wheel/wheelfile.py @@ -5,6 +5,7 @@ import hashlib import os.path import re import stat +import sys import time from collections import OrderedDict from distutils import log as logger @@ -13,6 +14,16 @@ from zipfile import ZIP_DEFLATED, ZipInfo, ZipFile from pipenv.vendor.wheel.cli import WheelError from pipenv.vendor.wheel.util import urlsafe_b64decode, as_unicode, native, urlsafe_b64encode, as_bytes, StringIO +if sys.version_info >= (3,): + from io import TextIOWrapper + + def read_csv(fp): + return csv.reader(TextIOWrapper(fp, newline='', encoding='utf-8')) +else: + def read_csv(fp): + for line in csv.reader(fp): + yield [column.decode('utf-8') for column in line] + # Non-greedy matching of an optional build number may be too clever (more # invalid wheel filenames will match). Separate regex for .dist-info? WHEEL_INFO_RE = re.compile( @@ -60,23 +71,24 @@ class WheelFile(ZipFile): raise WheelError('Missing {} file'.format(self.record_path)) with record: - for line in record: - line = line.decode('utf-8') - path, hash_sum, size = line.rsplit(u',', 2) - if hash_sum: - algorithm, hash_sum = hash_sum.split(u'=') - try: - hashlib.new(algorithm) - except ValueError: - raise WheelError('Unsupported hash algorithm: {}'.format(algorithm)) + for line in read_csv(record): + path, hash_sum, size = line + if not hash_sum: + continue - if algorithm.lower() in {'md5', 'sha1'}: - raise WheelError( - 'Weak hash algorithm ({}) is not permitted by PEP 427' - .format(algorithm)) + algorithm, hash_sum = hash_sum.split(u'=') + try: + hashlib.new(algorithm) + except ValueError: + raise WheelError('Unsupported hash algorithm: {}'.format(algorithm)) - self._file_hashes[path] = ( - algorithm, urlsafe_b64decode(hash_sum.encode('ascii'))) + if algorithm.lower() in {'md5', 'sha1'}: + raise WheelError( + 'Weak hash algorithm ({}) is not permitted by PEP 427' + .format(algorithm)) + + self._file_hashes[path] = ( + algorithm, urlsafe_b64decode(hash_sum.encode('ascii'))) def open(self, name_or_info, mode="r", pwd=None): def _update_crc(newdata, eof=None): From d2fe28a8b0a0f64dbc90c6e5fc27d28e0f2df967 Mon Sep 17 00:00:00 2001 From: Oz N Tiram Date: Sun, 2 Oct 2022 23:33:16 +0200 Subject: [PATCH 6/6] Bump dparse version to 0.6.2 --- pipenv/vendor/dparse/__init__.py | 2 +- pipenv/vendor/dparse/dependencies.py | 50 +++++- pipenv/vendor/dparse/errors.py | 13 +- pipenv/vendor/dparse/filetypes.py | 1 + pipenv/vendor/dparse/parser.py | 168 +++++++++++++----- pipenv/vendor/dparse/regex.py | 37 +--- pipenv/vendor/dparse/updater.py | 27 +-- pipenv/vendor/vendor.txt | 2 +- .../patches/vendor/dparse-local-yaml.patch | 20 --- tests/integration/conftest.py | 6 +- 10 files changed, 198 insertions(+), 128 deletions(-) delete mode 100644 tasks/vendoring/patches/vendor/dparse-local-yaml.patch diff --git a/pipenv/vendor/dparse/__init__.py b/pipenv/vendor/dparse/__init__.py index afe8f63f..c4d4ee76 100644 --- a/pipenv/vendor/dparse/__init__.py +++ b/pipenv/vendor/dparse/__init__.py @@ -4,6 +4,6 @@ from __future__ import unicode_literals, absolute_import __author__ = """Jannis Gebauer""" __email__ = 'support@pyup.io' -__version__ = '0.5.1' +__version__ = '0.6.2' from .parser import parse # noqa diff --git a/pipenv/vendor/dparse/dependencies.py b/pipenv/vendor/dparse/dependencies.py index 8881a9bc..2bc63b0a 100644 --- a/pipenv/vendor/dparse/dependencies.py +++ b/pipenv/vendor/dparse/dependencies.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals, absolute_import import json +from json import JSONEncoder from . import filetypes, errors @@ -11,7 +12,9 @@ class Dependency(object): """ - def __init__(self, name, specs, line, source="pypi", meta={}, extras=[], line_numbers=None, index_server=None, hashes=(), dependency_type=None, section=None): + def __init__(self, name, specs, line, source="pypi", meta={}, extras=[], + line_numbers=None, index_server=None, hashes=(), + dependency_type=None, section=None): """ :param name: @@ -87,12 +90,25 @@ class Dependency(object): return self.name +class DparseJSONEncoder(JSONEncoder): + def default(self, o): + from pipenv.patched.pip._vendor.packaging.specifiers import SpecifierSet + + if isinstance(o, SpecifierSet): + return str(o) + if isinstance(o, set): + return list(o) + + return JSONEncoder.default(self, o) + + class DependencyFile(object): """ """ - def __init__(self, content, path=None, sha=None, file_type=None, marker=((), ()), parser=None): + def __init__(self, content, path=None, sha=None, file_type=None, + marker=((), ()), parser=None, resolve=False): """ :param content: @@ -130,9 +146,11 @@ class DependencyFile(object): self.parser = parser_class.PipfileLockParser elif file_type == filetypes.setup_cfg: self.parser = parser_class.SetupCfgParser + elif file_type == filetypes.poetry_lock: + self.parser = parser_class.PoetryLockParser elif path is not None: - if path.endswith(".txt"): + if path.endswith((".txt", ".in")): self.parser = parser_class.RequirementsTXTParser elif path.endswith(".yml"): self.parser = parser_class.CondaYMLParser @@ -144,11 +162,23 @@ class DependencyFile(object): self.parser = parser_class.PipfileLockParser elif path.endswith("setup.cfg"): self.parser = parser_class.SetupCfgParser + elif path.endswith(filetypes.poetry_lock): + self.parser = parser_class.PoetryLockParser if not hasattr(self, "parser"): raise errors.UnknownDependencyFileError - self.parser = self.parser(self) + self.parser = self.parser(self, resolve=resolve) + + @property + def resolved_dependencies(self): + deps = self.dependencies.copy() + + for d in self.resolved_files: + if isinstance(d, DependencyFile): + deps.extend(d.resolved_dependencies) + + return deps def serialize(self): """ @@ -160,7 +190,9 @@ class DependencyFile(object): "content": self.content, "path": self.path, "sha": self.sha, - "dependencies": [dep.serialize() for dep in self.dependencies] + "dependencies": [dep.serialize() for dep in self.dependencies], + "resolved_dependencies": [dep.serialize() for dep in + self.resolved_dependencies] } @classmethod @@ -170,7 +202,8 @@ class DependencyFile(object): :param d: :return: """ - dependencies = [Dependency.deserialize(dep) for dep in d.pop("dependencies", [])] + dependencies = [Dependency.deserialize(dep) for dep in + d.pop("dependencies", [])] instance = cls(**d) instance.dependencies = dependencies return instance @@ -180,7 +213,7 @@ class DependencyFile(object): :return: """ - return json.dumps(self.serialize(), indent=2) + return json.dumps(self.serialize(), indent=2, cls=DparseJSONEncoder) def parse(self): """ @@ -192,5 +225,6 @@ class DependencyFile(object): return self self.parser.parse() - self.is_valid = len(self.dependencies) > 0 or len(self.resolved_files) > 0 + self.is_valid = len(self.dependencies) > 0 or len( + self.resolved_files) > 0 return self diff --git a/pipenv/vendor/dparse/errors.py b/pipenv/vendor/dparse/errors.py index b7a65430..74fc99db 100644 --- a/pipenv/vendor/dparse/errors.py +++ b/pipenv/vendor/dparse/errors.py @@ -1,8 +1,19 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals, absolute_import + class UnknownDependencyFileError(Exception): """ """ - pass + def __init__(self, message="Unknown File type to parse"): + self.message = message + super().__init__(self.message) + + +class MalformedDependencyFileError(Exception): + + def __init__(self, message="The dependency file is malformed. {info}", + info=""): + self.message = message.format(info=info) + super().__init__(self.message) diff --git a/pipenv/vendor/dparse/filetypes.py b/pipenv/vendor/dparse/filetypes.py index df8a913e..eadfff45 100644 --- a/pipenv/vendor/dparse/filetypes.py +++ b/pipenv/vendor/dparse/filetypes.py @@ -7,3 +7,4 @@ setup_cfg = "setup.cfg" tox_ini = "tox.ini" pipfile = "Pipfile" pipfile_lock = "Pipfile.lock" +poetry_lock = "poetry.lock" diff --git a/pipenv/vendor/dparse/parser.py b/pipenv/vendor/dparse/parser.py index bae38b71..faaad2e8 100644 --- a/pipenv/vendor/dparse/parser.py +++ b/pipenv/vendor/dparse/parser.py @@ -1,20 +1,25 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals, absolute_import + +import os from collections import OrderedDict import re from io import StringIO -from configparser import SafeConfigParser, NoOptionError +from configparser import ConfigParser, NoOptionError +from pathlib import PurePath - -from .regex import URL_REGEX, HASH_REGEX +from .errors import MalformedDependencyFileError +from .regex import HASH_REGEX from .dependencies import DependencyFile, Dependency -from pipenv.patched.pip._vendor.packaging.requirements import Requirement as PackagingRequirement, InvalidRequirement +from pipenv.patched.pip._vendor.packaging.requirements import Requirement as PackagingRequirement,\ + InvalidRequirement from . import filetypes import pipenv.vendor.toml as toml from pipenv.patched.pip._vendor.packaging.specifiers import SpecifierSet +from pipenv.patched.pip._vendor.packaging.version import Version, InvalidVersion import json @@ -22,23 +27,24 @@ import json def setuptools_parse_requirements_backport(strs): # pragma: no cover # Copyright (C) 2016 Jason R Coombs # - # 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: + # 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 above copyright notice and this permission notice shall be included + # in all copies or substantial portions of the Software. # - # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - # SOFTWARE. + # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + # IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + # CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """Yield ``Requirement`` objects for each specification in `strs` `strs` must be a string, or a (possibly-nested) iterable thereof. @@ -82,9 +88,11 @@ class RequirementsTXTLineParser(object): :return: """ try: - # setuptools requires a space before the comment. If this isn't the case, add it. + # setuptools requires a space before the comment. + # If this isn't the case, add it. if "\t#" in line: - parsed, = setuptools_parse_requirements_backport(line.replace("\t#", "\t #")) + parsed, = setuptools_parse_requirements_backport( + line.replace("\t#", "\t #")) else: parsed, = setuptools_parse_requirements_backport(line) except InvalidRequirement: @@ -104,13 +112,14 @@ class Parser(object): """ - def __init__(self, obj): + def __init__(self, obj, resolve=False): """ :param obj: """ self.obj = obj self._lines = None + self.resolve = resolve def iter_lines(self, lineno=0): """ @@ -175,10 +184,11 @@ class Parser(object): :param line: :return: """ - matches = URL_REGEX.findall(line) - if matches: - url = matches[0] - return url if url.endswith("/") else url + "/" + groups = re.split(pattern=r"[=\s]+", string=line.strip(), maxsplit=100) + + if len(groups) >= 2: + return groups[1] if groups[1].endswith("/") else groups[1] + "/" + return None @classmethod @@ -190,12 +200,10 @@ class Parser(object): :return: """ line = line.replace("-r ", "").replace("--requirement ", "") - parts = file_path.split("/") + normalized_path = PurePath(file_path) if " #" in line: line = line.split("#")[0].strip() - if len(parts) == 1: - return line - return "/".join(parts[:-1]) + "/" + line + return str(normalized_path.parent.joinpath(line)) class RequirementsTXTParser(Parser): @@ -216,17 +224,37 @@ class RequirementsTXTParser(Parser): # comments are lines that start with # only continue if line.startswith('-i') or \ - line.startswith('--index-url') or \ - line.startswith('--extra-index-url'): + line.startswith('--index-url') or \ + line.startswith('--extra-index-url'): # this file is using a private index server, try to parse it index_server = self.parse_index_server(line) continue - elif self.obj.path and (line.startswith('-r') or line.startswith('--requirement')): - self.obj.resolved_files.append(self.resolve_file(self.obj.path, line)) + elif self.obj.path and \ + (line.startswith('-r') or + line.startswith('--requirement')): + + req_file_path = self.resolve_file(self.obj.path, line) + + if self.resolve and os.path.exists(req_file_path): + with open(req_file_path, 'r') as f: + content = f.read() + + dep_file = DependencyFile( + content=content, + path=req_file_path, + resolve=True + ) + dep_file.parse() + self.obj.resolved_files.append(dep_file) + else: + self.obj.resolved_files.append(req_file_path) + elif line.startswith('-f') or line.startswith('--find-links') or \ - line.startswith('--no-index') or line.startswith('--allow-external') or \ - line.startswith('--allow-unverified') or line.startswith('-Z') or \ - line.startswith('--always-unzip'): + line.startswith('--no-index') or \ + line.startswith('--allow-external') or \ + line.startswith('--allow-unverified') or \ + line.startswith('-Z') or \ + line.startswith('--always-unzip'): continue elif self.is_marked_line(line): continue @@ -239,7 +267,8 @@ class RequirementsTXTParser(Parser): if "\\" in line: parseable_line = line.replace("\\", "") for next_line in self.iter_lines(num + 1): - parseable_line += next_line.strip().replace("\\", "") + parseable_line += next_line.strip().replace("\\", + "") line += "\n" + next_line if "\\" in next_line: continue @@ -250,7 +279,8 @@ class RequirementsTXTParser(Parser): hashes = [] if "--hash" in parseable_line: - parseable_line, hashes = Parser.parse_hashes(parseable_line) + parseable_line, hashes = Parser.parse_hashes( + parseable_line) req = RequirementsTXTLineParser.parse(parseable_line) if req: @@ -273,7 +303,7 @@ class ToxINIParser(Parser): :return: """ - parser = SafeConfigParser() + parser = ConfigParser() parser.readfp(StringIO(self.obj.content)) for section in parser.sections(): try: @@ -303,7 +333,8 @@ class CondaYMLParser(Parser): import yaml try: data = yaml.safe_load(self.obj.content) - if data and 'dependencies' in data and isinstance(data['dependencies'], list): + if data and 'dependencies' in data and \ + isinstance(data['dependencies'], list): for dep in data['dependencies']: if isinstance(dep, dict) and 'pip' in dep: for n, line in enumerate(dep['pip']): @@ -343,9 +374,10 @@ class PipfileParser(Parser): section=package_type ) ) - except (toml.TomlDecodeError, IndexError) as e: + except (toml.TomlDecodeError, IndexError): pass + class PipfileLockParser(Parser): def parse(self): @@ -373,13 +405,13 @@ class PipfileLockParser(Parser): section=package_type ) ) - except ValueError: - pass + except ValueError as e: + raise MalformedDependencyFileError(info=str(e)) class SetupCfgParser(Parser): def parse(self): - parser = SafeConfigParser() + parser = ConfigParser() parser.readfp(StringIO(self.obj.content)) for section in parser.values(): if section.name == 'options': @@ -404,7 +436,47 @@ class SetupCfgParser(Parser): self.obj.dependencies.append(req) -def parse(content, file_type=None, path=None, sha=None, marker=((), ()), parser=None): +class PoetryLockParser(Parser): + + def parse(self): + """ + Parse a poetry.lock + """ + try: + data = toml.loads(self.obj.content, _dict=OrderedDict) + pkg_key = 'package' + if data: + try: + dependencies = data[pkg_key] + except KeyError: + raise KeyError( + "Poetry lock file is missing the package section") + + for dep in dependencies: + try: + name = dep['name'] + spec = "=={version}".format( + version=Version(dep['version'])) + section = dep['category'] + except KeyError: + raise KeyError("Malformed poetry lock file") + except InvalidVersion: + continue + + self.obj.dependencies.append( + Dependency( + name=name, specs=SpecifierSet(spec), + dependency_type=filetypes.poetry_lock, + line=''.join([name, spec]), + section=section + ) + ) + except (toml.TomlDecodeError, IndexError) as e: + raise MalformedDependencyFileError(info=str(e)) + + +def parse(content, file_type=None, path=None, sha=None, marker=((), ()), + parser=None, resolve=False): """ :param content: @@ -415,13 +487,15 @@ def parse(content, file_type=None, path=None, sha=None, marker=((), ()), parser= :param parser: :return: """ + dep_file = DependencyFile( content=content, path=path, sha=sha, marker=marker, file_type=file_type, - parser=parser + parser=parser, + resolve=resolve ) return dep_file.parse() diff --git a/pipenv/vendor/dparse/regex.py b/pipenv/vendor/dparse/regex.py index 40cc4091..4a1204e1 100644 --- a/pipenv/vendor/dparse/regex.py +++ b/pipenv/vendor/dparse/regex.py @@ -1,39 +1,4 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import, print_function, unicode_literals -import re -# see https://gist.github.com/dperini/729294 -URL_REGEX = re.compile( - # protocol identifier - "(?:(?:https?|ftp)://)" - # user:pass authentication - "(?:\S+(?::\S*)?@)?" - "(?:" - # IP address exclusion - # private & local networks - "(?!(?:10|127)(?:\.\d{1,3}){3})" - "(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})" - "(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})" - # IP address dotted notation octets - # excludes loopback network 0.0.0.0 - # excludes reserved space >= 224.0.0.0 - # excludes network & broadcast addresses - # (first & last IP address of each class) - "(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])" - "(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}" - "(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))" - "|" - # host name - "(?:(?:[a-z\u00a1-\uffff0-9]-?)*[a-z\u00a1-\uffff0-9]+)" - # domain name - "(?:\.(?:[a-z\u00a1-\uffff0-9]-?)*[a-z\u00a1-\uffff0-9]+)*" - # TLD identifier - "(?:\.(?:[a-z\u00a1-\uffff]{2,}))" - ")" - # port number - "(?::\d{2,5})?" - # resource path - "(?:/\S*)?", - re.UNICODE) - -HASH_REGEX = r"--hash[=| ][\w]+:[\w]+" +HASH_REGEX = r"--hash[=| ]\w+:\w+" diff --git a/pipenv/vendor/dparse/updater.py b/pipenv/vendor/dparse/updater.py index 48117110..7b7ba9a5 100644 --- a/pipenv/vendor/dparse/updater.py +++ b/pipenv/vendor/dparse/updater.py @@ -8,24 +8,26 @@ import os class RequirementsTXTUpdater(object): - SUB_REGEX = r"^{}(?=\s*\r?\n?$)" @classmethod def update(cls, content, dependency, version, spec="==", hashes=()): """ - Updates the requirement to the latest version for the given content and adds hashes - if neccessary. + Updates the requirement to the latest version for the given content + and adds hashes if necessary. :param content: str, content :return: str, updated content """ - new_line = "{name}{spec}{version}".format(name=dependency.full_name, spec=spec, version=version) + new_line = "{name}{spec}{version}".format(name=dependency.full_name, + spec=spec, version=version) appendix = '' # leave environment markers intact if ";" in dependency.line: - # condense multiline, split out the env marker, strip comments and --hashes - new_line += ";" + dependency.line.splitlines()[0].split(";", 1)[1] \ - .split("#")[0].split("--hash")[0].rstrip() + # condense multiline, split out the env marker, strip comments + # and --hashes + new_line += ";" + \ + dependency.line.splitlines()[0].split(";", 1)[1] \ + .split("#")[0].split("--hash")[0].rstrip() # add the comment if "#" in dependency.line: # split the line into parts: requirement and comment @@ -40,7 +42,8 @@ class RequirementsTXTUpdater(object): else: break appendix += trailing_whitespace + "#" + comment - # if this is a hashed requirement, add a multiline break before the comment + # if this is a hashed requirement, add a multiline break before the + # comment if dependency.hashes and not new_line.endswith("\\"): new_line += " \\" # if this is a hashed requirement, add the hashes @@ -81,14 +84,16 @@ class PipfileUpdater(object): for package_type in ['packages', 'dev-packages']: if package_type in data: if dependency.full_name in data[package_type]: - data[package_type][dependency.full_name] = "{spec}{version}".format( + data[package_type][ + dependency.full_name] = "{spec}{version}".format( spec=spec, version=version ) try: from pipenv.project import Project except ImportError: - raise ImportError("Updating a Pipfile requires the pipenv extra to be installed. Install it with " - "pip install dparse[pipenv]") + raise ImportError( + "Updating a Pipfile requires the pipenv extra to be installed." + " Install it with pip install dparse[pipenv]") pipfile = tempfile.NamedTemporaryFile(delete=False) p = Project(chdir=False) p.write_toml(data=data, path=pipfile.name) diff --git a/pipenv/vendor/vendor.txt b/pipenv/vendor/vendor.txt index 0238665b..10f95dd4 100644 --- a/pipenv/vendor/vendor.txt +++ b/pipenv/vendor/vendor.txt @@ -5,7 +5,7 @@ click-didyoumean==0.0.3 click==8.0.3 colorama==0.4.4 distlib==0.3.2 -dparse==0.5.1 +dparse==0.6.2 idna==3.2 markupsafe==2.0.1 parse==1.19.0 diff --git a/tasks/vendoring/patches/vendor/dparse-local-yaml.patch b/tasks/vendoring/patches/vendor/dparse-local-yaml.patch deleted file mode 100644 index 896b9ee0..00000000 --- a/tasks/vendoring/patches/vendor/dparse-local-yaml.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/dparse/parser.py b/dparse/parser.py -index c01ebab..18689a5 100644 ---- a/pipenv/vendor/dparse/parser.py -+++ b/pipenv/vendor/dparse/parser.py -@@ -2,7 +2,6 @@ - from __future__ import unicode_literals, absolute_import - from collections import OrderedDict - import re --import yaml - - from io import StringIO - -@@ -301,6 +300,7 @@ class CondaYMLParser(Parser): - - :return: - """ -+ import yaml - try: - data = yaml.safe_load(self.obj.content) - if data and 'dependencies' in data and isinstance(data['dependencies'], list): diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index d99afad8..efa3876d 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -16,9 +16,6 @@ from tempfile import TemporaryDirectory import pytest import requests from click.testing import CliRunner -from pytest_pypi.app import prepare_fixtures -from pytest_pypi.app import prepare_packages as prepare_pypi_packages -import pypiserver from pipenv.cli import cli from pipenv.exceptions import VirtualenvActivationException @@ -31,6 +28,9 @@ from pipenv.vendor.vistir.path import ( create_tracked_tempdir, handle_remove_readonly, mkdir_p ) +from pytest_pypi.app import prepare_fixtures +from pytest_pypi.app import prepare_packages as prepare_pypi_packages +import pypiserver log = logging.getLogger(__name__) warnings.simplefilter("default", category=ResourceWarning)