Skip to content

Commit 8b07900

Browse files
authored
Merge pull request #123 from bennati/update-resolvelib-dependency
Update dependency resolvelib to latest
2 parents 102ef9b + 6d46fbf commit 8b07900

9 files changed

+185
-188
lines changed

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pkginfo2==30.0.0
1717
pyparsing==3.0.9
1818
PyYAML==6.0
1919
requests==2.28.1
20-
resolvelib==0.8.1
20+
resolvelib >= 1.0.0
2121
saneyaml==0.5.2
2222
soupsieve==2.3.2.post1
2323
text-unidecode==1.3

setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ install_requires =
6464
pkginfo2 >= 30.0.0
6565
pip-requirements-parser >= 32.0.1
6666
requests >= 2.18.0
67-
resolvelib >= 0.8.1
67+
resolvelib >= 1.0.0
6868
saneyaml >= 0.5.2
6969
toml >= 0.10.0
7070
mock >= 3.0.5

tests/data/azure-devops.req-310-expected.json

+58-60
Large diffs are not rendered by default.

tests/data/azure-devops.req-38-expected.json

+58-60
Large diffs are not rendered by default.

tests/data/insecure-setup-2/setup.py-expected.json

+11-10
Original file line numberDiff line numberDiff line change
@@ -5686,12 +5686,12 @@
56865686
"type": "pypi",
56875687
"namespace": null,
56885688
"name": "msgpack",
5689-
"version": "1.0.4",
5689+
"version": "1.0.5",
56905690
"qualifiers": {},
56915691
"subpath": null,
56925692
"primary_language": "Python",
56935693
"description": "MessagePack serializer\n# MessagePack for Python\n\n[![Build Status](https://travis-ci.org/msgpack/msgpack-python.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-python)\n[![Documentation Status](https://readthedocs.org/projects/msgpack-python/badge/?version=latest)](https://msgpack-python.readthedocs.io/en/latest/?badge=latest)\n\n## What's this\n\n[MessagePack](https://msgpack.org/) is an efficient binary serialization format.\nIt lets you exchange data among multiple languages like JSON.\nBut it's faster and smaller.\nThis package provides CPython bindings for reading and writing MessagePack data.\n\n\n## Very important notes for existing users\n\n### PyPI package name\n\nPackage name on PyPI was changed from `msgpack-python` to `msgpack` from 0.5.\n\nWhen upgrading from msgpack-0.4 or earlier, do `pip uninstall msgpack-python` before\n`pip install -U msgpack`.\n\n\n### Compatibility with the old format\n\nYou can use `use_bin_type=False` option to pack `bytes`\nobject into raw type in the old msgpack spec, instead of bin type in new msgpack spec.\n\nYou can unpack old msgpack format using `raw=True` option.\nIt unpacks str (raw) type in msgpack into Python bytes.\n\nSee note below for detail.\n\n\n### Major breaking changes in msgpack 1.0\n\n* Python 2\n\n * The extension module does not support Python 2 anymore.\n The pure Python implementation (`msgpack.fallback`) is used for Python 2.\n\n* Packer\n\n * `use_bin_type=True` by default. bytes are encoded in bin type in msgpack.\n **If you are still using Python 2, you must use unicode for all string types.**\n You can use `use_bin_type=False` to encode into old msgpack format.\n * `encoding` option is removed. UTF-8 is used always.\n\n* Unpacker\n\n * `raw=False` by default. It assumes str types are valid UTF-8 string\n and decode them to Python str (unicode) object.\n * `encoding` option is removed. You can use `raw=True` to support old format.\n * Default value of `max_buffer_size` is changed from 0 to 100 MiB.\n * Default value of `strict_map_key` is changed to True to avoid hashdos.\n You need to pass `strict_map_key=False` if you have data which contain map keys\n which type is not bytes or str.\n\n\n## Install\n\n```\n$ pip install msgpack\n```\n\n### Pure Python implementation\n\nThe extension module in msgpack (`msgpack._cmsgpack`) does not support\nPython 2 and PyPy.\n\nBut msgpack provides a pure Python implementation (`msgpack.fallback`)\nfor PyPy and Python 2.\n\n\n\n### Windows\n\nWhen you can't use a binary distribution, you need to install Visual Studio\nor Windows SDK on Windows.\nWithout extension, using pure Python implementation on CPython runs slowly.\n\n\n## How to use\n\nNOTE: In examples below, I use `raw=False` and `use_bin_type=True` for users\nusing msgpack < 1.0. These options are default from msgpack 1.0 so you can omit them.\n\n\n### One-shot pack & unpack\n\nUse `packb` for packing and `unpackb` for unpacking.\nmsgpack provides `dumps` and `loads` as an alias for compatibility with\n`json` and `pickle`.\n\n`pack` and `dump` packs to a file-like object.\n`unpack` and `load` unpacks from a file-like object.\n\n```pycon\n>>> import msgpack\n>>> msgpack.packb([1, 2, 3], use_bin_type=True)\n'\\x93\\x01\\x02\\x03'\n>>> msgpack.unpackb(_, raw=False)\n[1, 2, 3]\n```\n\n`unpack` unpacks msgpack's array to Python's list, but can also unpack to tuple:\n\n```pycon\n>>> msgpack.unpackb(b'\\x93\\x01\\x02\\x03', use_list=False, raw=False)\n(1, 2, 3)\n```\n\nYou should always specify the `use_list` keyword argument for backward compatibility.\nSee performance issues relating to `use_list option`_ below.\n\nRead the docstring for other options.\n\n\n### Streaming unpacking\n\n`Unpacker` is a \"streaming unpacker\". It unpacks multiple objects from one\nstream (or from bytes provided through its `feed` method).\n\n```py\nimport msgpack\nfrom io import BytesIO\n\nbuf = BytesIO()\nfor i in range(100):\n buf.write(msgpack.packb(i, use_bin_type=True))\n\nbuf.seek(0)\n\nunpacker = msgpack.Unpacker(buf, raw=False)\nfor unpacked in unpacker:\n print(unpacked)\n```\n\n\n### Packing/unpacking of custom data type\n\nIt is also possible to pack/unpack custom data types. Here is an example for\n`datetime.datetime`.\n\n```py\nimport datetime\nimport msgpack\n\nuseful_dict = {\n \"id\": 1,\n \"created\": datetime.datetime.now(),\n}\n\ndef decode_datetime(obj):\n if '__datetime__' in obj:\n obj = datetime.datetime.strptime(obj[\"as_str\"], \"%Y%m%dT%H:%M:%S.%f\")\n return obj\n\ndef encode_datetime(obj):\n if isinstance(obj, datetime.datetime):\n return {'__datetime__': True, 'as_str': obj.strftime(\"%Y%m%dT%H:%M:%S.%f\")}\n return obj\n\n\npacked_dict = msgpack.packb(useful_dict, default=encode_datetime, use_bin_type=True)\nthis_dict_again = msgpack.unpackb(packed_dict, object_hook=decode_datetime, raw=False)\n```\n\n`Unpacker`'s `object_hook` callback receives a dict; the\n`object_pairs_hook` callback may instead be used to receive a list of\nkey-value pairs.\n\n\n### Extended types\n\nIt is also possible to pack/unpack custom data types using the **ext** type.\n\n```pycon\n>>> import msgpack\n>>> import array\n>>> def default(obj):\n... if isinstance(obj, array.array) and obj.typecode == 'd':\n... return msgpack.ExtType(42, obj.tostring())\n... raise TypeError(\"Unknown type: %r\" % (obj,))\n...\n>>> def ext_hook(code, data):\n... if code == 42:\n... a = array.array('d')\n... a.fromstring(data)\n... return a\n... return ExtType(code, data)\n...\n>>> data = array.array('d', [1.2, 3.4])\n>>> packed = msgpack.packb(data, default=default, use_bin_type=True)\n>>> unpacked = msgpack.unpackb(packed, ext_hook=ext_hook, raw=False)\n>>> data == unpacked\nTrue\n```\n\n\n### Advanced unpacking control\n\nAs an alternative to iteration, `Unpacker` objects provide `unpack`,\n`skip`, `read_array_header` and `read_map_header` methods. The former two\nread an entire message from the stream, respectively de-serialising and returning\nthe result, or ignoring it. The latter two methods return the number of elements\nin the upcoming container, so that each element in an array, or key-value pair\nin a map, can be unpacked or skipped individually.\n\n\n## Notes\n\n### string and binary type\n\nEarly versions of msgpack didn't distinguish string and binary types.\nThe type for representing both string and binary types was named **raw**.\n\nYou can pack into and unpack from this old spec using `use_bin_type=False`\nand `raw=True` options.\n\n```pycon\n>>> import msgpack\n>>> msgpack.unpackb(msgpack.packb([b'spam', u'eggs'], use_bin_type=False), raw=True)\n[b'spam', b'eggs']\n>>> msgpack.unpackb(msgpack.packb([b'spam', u'eggs'], use_bin_type=True), raw=False)\n[b'spam', 'eggs']\n```\n\n### ext type\n\nTo use the **ext** type, pass `msgpack.ExtType` object to packer.\n\n```pycon\n>>> import msgpack\n>>> packed = msgpack.packb(msgpack.ExtType(42, b'xyzzy'))\n>>> msgpack.unpackb(packed)\nExtType(code=42, data='xyzzy')\n```\n\nYou can use it with `default` and `ext_hook`. See below.\n\n\n### Security\n\nTo unpacking data received from unreliable source, msgpack provides\ntwo security options.\n\n`max_buffer_size` (default: `100*1024*1024`) limits the internal buffer size.\nIt is used to limit the preallocated list size too.\n\n`strict_map_key` (default: `True`) limits the type of map keys to bytes and str.\nWhile msgpack spec doesn't limit the types of the map keys,\nthere is a risk of the hashdos.\nIf you need to support other types for map keys, use `strict_map_key=False`.\n\n\n### Performance tips\n\nCPython's GC starts when growing allocated object.\nThis means unpacking may cause useless GC.\nYou can use `gc.disable()` when unpacking large message.\n\nList is the default sequence type of Python.\nBut tuple is lighter than list.\nYou can use `use_list=False` while unpacking when performance is important.",
5694-
"release_date": "2022-06-03T07:30:12",
5694+
"release_date": "2023-03-08T17:50:48",
56955695
"parties": [
56965696
{
56975697
"type": "person",
@@ -5705,6 +5705,7 @@
57055705
"Intended Audience :: Developers",
57065706
"Programming Language :: Python :: 3",
57075707
"Programming Language :: Python :: 3.10",
5708+
"Programming Language :: Python :: 3.11",
57085709
"Programming Language :: Python :: 3.6",
57095710
"Programming Language :: Python :: 3.7",
57105711
"Programming Language :: Python :: 3.8",
@@ -5713,11 +5714,11 @@
57135714
"Programming Language :: Python :: Implementation :: PyPy"
57145715
],
57155716
"homepage_url": "https://msgpack.org/",
5716-
"download_url": "https://files.pythonhosted.org/packages/22/44/0829b19ac243211d1d2bd759999aa92196c546518b0be91de9cacc98122a/msgpack-1.0.4.tar.gz",
5717-
"size": 128053,
5717+
"download_url": "https://files.pythonhosted.org/packages/dc/a1/eba11a0d4b764bc62966a565b470f8c6f38242723ba3057e9b5098678c30/msgpack-1.0.5.tar.gz",
5718+
"size": 127834,
57185719
"sha1": null,
5719-
"md5": "1822cdb939e7531f7ad0f7f09b434f22",
5720-
"sha256": "f5d869c18f030202eb412f08b28d2afeea553d6613aee89e200d7aca7ef01f5f",
5720+
"md5": "da12a9f0a65a803ec005219f6095d0a3",
5721+
"sha256": "c075544284eadc5cddc70f4757331d99dcbc16b2bbd4849d15f8aae4cf36d31c",
57215722
"sha512": null,
57225723
"bug_tracking_url": "https://github.com/msgpack/msgpack-python/issues",
57235724
"code_view_url": "https://github.com/msgpack/msgpack-python",
@@ -5737,9 +5738,9 @@
57375738
"dependencies": [],
57385739
"repository_homepage_url": null,
57395740
"repository_download_url": null,
5740-
"api_data_url": "https://pypi.org/pypi/msgpack/1.0.4/json",
5741+
"api_data_url": "https://pypi.org/pypi/msgpack/1.0.5/json",
57415742
"datasource_id": null,
5742-
"purl": "pkg:pypi/[email protected].4"
5743+
"purl": "pkg:pypi/[email protected].5"
57435744
},
57445745
{
57455746
"type": "pypi",
@@ -8644,7 +8645,7 @@
86448645
"pkg:pypi/[email protected]",
86458646
"pkg:pypi/[email protected]",
86468647
"pkg:pypi/[email protected]",
8647-
"pkg:pypi/[email protected].4",
8648+
"pkg:pypi/[email protected].5",
86488649
"pkg:pypi/[email protected]"
86498650
]
86508651
},
@@ -8772,7 +8773,7 @@
87728773
]
87738774
},
87748775
{
8775-
"package": "pkg:pypi/[email protected].4",
8776+
"package": "pkg:pypi/[email protected].5",
87768777
"dependencies": []
87778778
},
87788779
{

tests/data/pinned-pdt-requirements.txt-expected.json

+17-17
Original file line numberDiff line numberDiff line change
@@ -2831,12 +2831,12 @@
28312831
"type": "pypi",
28322832
"namespace": null,
28332833
"name": "openpyxl",
2834-
"version": "3.1.1",
2834+
"version": "3.1.2",
28352835
"qualifiers": {},
28362836
"subpath": null,
28372837
"primary_language": "Python",
28382838
"description": "A Python library to read/write Excel 2010 xlsx/xlsm files\n.. image:: https://coveralls.io/repos/bitbucket/openpyxl/openpyxl/badge.svg?branch=default\n :target: https://coveralls.io/bitbucket/openpyxl/openpyxl?branch=default\n :alt: coverage status\n\nIntroduction\n------------\n\nopenpyxl is a Python library to read/write Excel 2010 xlsx/xlsm/xltx/xltm files.\n\nIt was born from lack of existing library to read/write natively from Python\nthe Office Open XML format.\n\nAll kudos to the PHPExcel team as openpyxl was initially based on PHPExcel.\n\n\nSecurity\n--------\n\nBy default openpyxl does not guard against quadratic blowup or billion laughs\nxml attacks. To guard against these attacks install defusedxml.\n\nMailing List\n------------\n\nThe user list can be found on http://groups.google.com/group/openpyxl-users\n\n\nSample code::\n\n from openpyxl import Workbook\n wb = Workbook()\n\n # grab the active worksheet\n ws = wb.active\n\n # Data can be assigned directly to cells\n ws['A1'] = 42\n\n # Rows can also be appended\n ws.append([1, 2, 3])\n\n # Python types will automatically be converted\n import datetime\n ws['A2'] = datetime.datetime.now()\n\n # Save the file\n wb.save(\"sample.xlsx\")\n\n\nDocumentation\n-------------\n\nThe documentation is at: https://openpyxl.readthedocs.io\n\n* installation methods\n* code examples\n* instructions for contributing\n\nRelease notes: https://openpyxl.readthedocs.io/en/stable/changes.html",
2839-
"release_date": "2023-02-13T16:51:26",
2839+
"release_date": "2023-03-11T16:58:36",
28402840
"parties": [
28412841
{
28422842
"type": "person",
@@ -2860,11 +2860,11 @@
28602860
"Programming Language :: Python :: 3.9"
28612861
],
28622862
"homepage_url": "https://openpyxl.readthedocs.io",
2863-
"download_url": "https://files.pythonhosted.org/packages/9e/57/1d3c2ce7f6f783be9b21569fc468a9f3660e35cc17017abfbbc26d3bd061/openpyxl-3.1.1-py2.py3-none-any.whl",
2864-
"size": 249839,
2863+
"download_url": "https://files.pythonhosted.org/packages/6a/94/a59521de836ef0da54aaf50da6c4da8fb4072fb3053fa71f052fd9399e7a/openpyxl-3.1.2-py2.py3-none-any.whl",
2864+
"size": 249985,
28652865
"sha1": null,
2866-
"md5": "864e1e1ea061fe056ade64f4e7bbaf22",
2867-
"sha256": "a0266e033e65f33ee697254b66116a5793c15fc92daf64711080000df4cfe0a8",
2866+
"md5": "797657015056d50de2bc003d8a9379c2",
2867+
"sha256": "f91456ead12ab3c6c2e9491cf33ba6d08357d802192379bb482f1033ade496f5",
28682868
"sha512": null,
28692869
"bug_tracking_url": "https://foss.heptapod.net/openpyxl/openpyxl/-/issues",
28702870
"code_view_url": "https://foss.heptapod.net/openpyxl/openpyxl",
@@ -2884,20 +2884,20 @@
28842884
"dependencies": [],
28852885
"repository_homepage_url": null,
28862886
"repository_download_url": null,
2887-
"api_data_url": "https://pypi.org/pypi/openpyxl/3.1.1/json",
2887+
"api_data_url": "https://pypi.org/pypi/openpyxl/3.1.2/json",
28882888
"datasource_id": null,
2889-
"purl": "pkg:pypi/[email protected].1"
2889+
"purl": "pkg:pypi/[email protected].2"
28902890
},
28912891
{
28922892
"type": "pypi",
28932893
"namespace": null,
28942894
"name": "openpyxl",
2895-
"version": "3.1.1",
2895+
"version": "3.1.2",
28962896
"qualifiers": {},
28972897
"subpath": null,
28982898
"primary_language": "Python",
28992899
"description": "A Python library to read/write Excel 2010 xlsx/xlsm files\n.. image:: https://coveralls.io/repos/bitbucket/openpyxl/openpyxl/badge.svg?branch=default\n :target: https://coveralls.io/bitbucket/openpyxl/openpyxl?branch=default\n :alt: coverage status\n\nIntroduction\n------------\n\nopenpyxl is a Python library to read/write Excel 2010 xlsx/xlsm/xltx/xltm files.\n\nIt was born from lack of existing library to read/write natively from Python\nthe Office Open XML format.\n\nAll kudos to the PHPExcel team as openpyxl was initially based on PHPExcel.\n\n\nSecurity\n--------\n\nBy default openpyxl does not guard against quadratic blowup or billion laughs\nxml attacks. To guard against these attacks install defusedxml.\n\nMailing List\n------------\n\nThe user list can be found on http://groups.google.com/group/openpyxl-users\n\n\nSample code::\n\n from openpyxl import Workbook\n wb = Workbook()\n\n # grab the active worksheet\n ws = wb.active\n\n # Data can be assigned directly to cells\n ws['A1'] = 42\n\n # Rows can also be appended\n ws.append([1, 2, 3])\n\n # Python types will automatically be converted\n import datetime\n ws['A2'] = datetime.datetime.now()\n\n # Save the file\n wb.save(\"sample.xlsx\")\n\n\nDocumentation\n-------------\n\nThe documentation is at: https://openpyxl.readthedocs.io\n\n* installation methods\n* code examples\n* instructions for contributing\n\nRelease notes: https://openpyxl.readthedocs.io/en/stable/changes.html",
2900-
"release_date": "2023-02-13T16:51:28",
2900+
"release_date": "2023-03-11T16:58:38",
29012901
"parties": [
29022902
{
29032903
"type": "person",
@@ -2921,11 +2921,11 @@
29212921
"Programming Language :: Python :: 3.9"
29222922
],
29232923
"homepage_url": "https://openpyxl.readthedocs.io",
2924-
"download_url": "https://files.pythonhosted.org/packages/10/bf/950ea7896f3c42ab04073cd2903f0a190ba77ef28bdf76191f6f86373712/openpyxl-3.1.1.tar.gz",
2925-
"size": 185802,
2924+
"download_url": "https://files.pythonhosted.org/packages/42/e8/af028681d493814ca9c2ff8106fc62a4a32e4e0ae14602c2a98fc7b741c8/openpyxl-3.1.2.tar.gz",
2925+
"size": 185977,
29262926
"sha1": null,
2927-
"md5": "0b1a5d776707ef471810f61c7bf77a2d",
2928-
"sha256": "f06d44e2c973781068bce5ecf860a09bcdb1c7f5ce1facd5e9aa82c92c93ae72",
2927+
"md5": "fd7b9e3c703e2889f6a1edbdb9737768",
2928+
"sha256": "a6f5977418eff3b2d5500d54d9db50c8277a368436f4e4f8ddb1be3422870184",
29292929
"sha512": null,
29302930
"bug_tracking_url": "https://foss.heptapod.net/openpyxl/openpyxl/-/issues",
29312931
"code_view_url": "https://foss.heptapod.net/openpyxl/openpyxl",
@@ -2945,9 +2945,9 @@
29452945
"dependencies": [],
29462946
"repository_homepage_url": null,
29472947
"repository_download_url": null,
2948-
"api_data_url": "https://pypi.org/pypi/openpyxl/3.1.1/json",
2948+
"api_data_url": "https://pypi.org/pypi/openpyxl/3.1.2/json",
29492949
"datasource_id": null,
2950-
"purl": "pkg:pypi/[email protected].1"
2950+
"purl": "pkg:pypi/[email protected].2"
29512951
},
29522952
{
29532953
"type": "pypi",
@@ -5025,7 +5025,7 @@
50255025
{
50265026
"key": "openpyxl",
50275027
"package_name": "openpyxl",
5028-
"installed_version": "3.1.1",
5028+
"installed_version": "3.1.2",
50295029
"dependencies": [
50305030
{
50315031
"key": "et-xmlfile",

0 commit comments

Comments
 (0)