Skip to content

Commit fd7236a

Browse files
swastkkswastkk
committed
Align the project with latest skeleton.
Signed-off-by: swastik <swastkk@gmail.com> - Test errors resolve in tests/resolution.py - Bump the requirments packages to latest version - Test error resolve in test_resolution.py - Tests updated with PYINSP_REGEN_TEST_FIXTURES
1 parent 37d6d74 commit fd7236a

22 files changed

+333
-325
lines changed

‎azure-pipelines.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
image_name: ubuntu-20.04
2222
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
2323
test_suites:
24-
all: venv/bin/pytest -n 2 -vvs
24+
all: venv/bin/pytest -n 2 -vvs --reruns 2
2525

2626
- template: etc/ci/azure-posix.yml
2727
parameters:
@@ -45,7 +45,7 @@ jobs:
4545
image_name: macos-11
4646
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
4747
test_suites:
48-
all: venv/bin/pytest -n 2 -vvs
48+
all: venv/bin/pytest -n 2 -vvs --reruns 2
4949

5050
- template: etc/ci/azure-posix.yml
5151
parameters:

‎requirements.txt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
attrs==22.1.0
1+
attrs==22.2.0
22
beautifulsoup4==4.11.1
3-
certifi==2022.6.15
4-
charset-normalizer==2.1.0
3+
certifi==2022.12.7
4+
charset-normalizer==3.0.1
55
click==8.1.3
6-
colorama==0.4.5
7-
commoncode==30.2.0
6+
colorama==0.4.6
7+
commoncode==31.0.0
88
dparse2==0.7.0
9-
idna==3.3
10-
importlib-metadata==4.12.0
9+
idna==3.4
10+
importlib-metadata==6.0.0
1111
intbitset==3.0.2
12-
packageurl-python==0.10.0
12+
packageurl-python==0.10.4
1313
packaging==21.3
1414
packvers==21.5
1515
pip-requirements-parser==32.0.1
1616
pkginfo2==30.0.0
1717
pyparsing==3.0.9
1818
PyYAML==6.0
19-
requests==2.28.1
20-
resolvelib==0.8.1
21-
saneyaml==0.5.2
19+
requests==2.28.2
20+
resolvelib==0.9.0
21+
saneyaml==0.6.0
2222
soupsieve==2.3.2.post1
2323
text-unidecode==1.3
2424
tinynetrc==1.3.1
2525
toml==0.10.2
26-
urllib3==1.26.11
27-
zipp==3.8.1
26+
urllib3==1.26.14
27+
zipp==3.12.0

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

Lines changed: 22 additions & 22 deletions
Large diffs are not rendered by default.

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

Lines changed: 22 additions & 22 deletions
Large diffs are not rendered by default.

‎tests/data/environment-marker-test-requirements.txt-expected.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
55
"tool_version": "0.9.4",
66
"options": [
7-
"--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/environment-marker-test-requirements.txt",
7+
"--requirement /home/swastik/Desktop/Projects/python-inspector/tests/data/environment-marker-test-requirements.txt",
88
"--index-url https://pypi.org/simple",
99
"--python-version 37",
1010
"--operating-system linux",
@@ -17,7 +17,7 @@
1717
"files": [
1818
{
1919
"type": "file",
20-
"path": "/home/tg1999/Desktop/python-inspector-1/tests/data/environment-marker-test-requirements.txt",
20+
"path": "/home/swastik/Desktop/Projects/python-inspector/tests/data/environment-marker-test-requirements.txt",
2121
"package_data": [
2222
{
2323
"type": "pypi",

‎tests/data/frozen-requirements.txt-expected.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
55
"tool_version": "0.9.4",
66
"options": [
7-
"--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/frozen-requirements.txt",
7+
"--requirement /home/swastik/Desktop/Projects/python-inspector/tests/data/frozen-requirements.txt",
88
"--index-url https://pypi.org/simple",
99
"--python-version 38",
1010
"--operating-system linux",
@@ -17,7 +17,7 @@
1717
"files": [
1818
{
1919
"type": "file",
20-
"path": "/home/tg1999/Desktop/python-inspector-1/tests/data/frozen-requirements.txt",
20+
"path": "/home/swastik/Desktop/Projects/python-inspector/tests/data/frozen-requirements.txt",
2121
"package_data": [
2222
{
2323
"type": "pypi",
@@ -6013,12 +6013,12 @@
60136013
"type": "pypi",
60146014
"namespace": null,
60156015
"name": "pip",
6016-
"version": "22.3.1",
6016+
"version": "23.0",
60176017
"qualifiers": {},
60186018
"subpath": null,
60196019
"primary_language": "Python",
60206020
"description": "The PyPA recommended tool for installing Python packages.\npip - The Python Package Installer\n==================================\n\n.. image:: https://img.shields.io/pypi/v/pip.svg\n :target: https://pypi.org/project/pip/\n\n.. image:: https://readthedocs.org/projects/pip/badge/?version=latest\n :target: https://pip.pypa.io/en/latest\n\npip is the `package installer`_ for Python. You can use pip to install packages from the `Python Package Index`_ and other indexes.\n\nPlease take a look at our documentation for how to install and use pip:\n\n* `Installation`_\n* `Usage`_\n\nWe release updates regularly, with a new version every 3 months. Find more details in our documentation:\n\n* `Release notes`_\n* `Release process`_\n\nIn pip 20.3, we've `made a big improvement to the heart of pip`_; `learn more`_. We want your input, so `sign up for our user experience research studies`_ to help us do it right.\n\n**Note**: pip 21.0, in January 2021, removed Python 2 support, per pip's `Python 2 support policy`_. Please migrate to Python 3.\n\nIf you find bugs, need help, or want to talk to the developers, please use our mailing lists or chat rooms:\n\n* `Issue tracking`_\n* `Discourse channel`_\n* `User IRC`_\n\nIf you want to get involved head over to GitHub to get the source code, look at our development documentation and feel free to jump on the developer mailing lists and chat rooms:\n\n* `GitHub page`_\n* `Development documentation`_\n* `Development IRC`_\n\nCode of Conduct\n---------------\n\nEveryone interacting in the pip project's codebases, issue trackers, chat\nrooms, and mailing lists is expected to follow the `PSF Code of Conduct`_.\n\n.. _package installer: https://packaging.python.org/guides/tool-recommendations/\n.. _Python Package Index: https://pypi.org\n.. _Installation: https://pip.pypa.io/en/stable/installation/\n.. _Usage: https://pip.pypa.io/en/stable/\n.. _Release notes: https://pip.pypa.io/en/stable/news.html\n.. _Release process: https://pip.pypa.io/en/latest/development/release-process/\n.. _GitHub page: https://github.com/pypa/pip\n.. _Development documentation: https://pip.pypa.io/en/latest/development\n.. _made a big improvement to the heart of pip: https://pyfound.blogspot.com/2020/11/pip-20-3-new-resolver.html\n.. _learn more: https://pip.pypa.io/en/latest/user_guide/#changes-to-the-pip-dependency-resolver-in-20-3-2020\n.. _sign up for our user experience research studies: https://pyfound.blogspot.com/2020/03/new-pip-resolver-to-roll-out-this-year.html\n.. _Python 2 support policy: https://pip.pypa.io/en/latest/development/release-process/#python-2-support\n.. _Issue tracking: https://github.com/pypa/pip/issues\n.. _Discourse channel: https://discuss.python.org/c/packaging\n.. _User IRC: https://kiwiirc.com/nextclient/#ircs://irc.libera.chat:+6697/pypa\n.. _Development IRC: https://kiwiirc.com/nextclient/#ircs://irc.libera.chat:+6697/pypa-dev\n.. _PSF Code of Conduct: https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md",
6021-
"release_date": "2022-11-05T15:56:17",
6021+
"release_date": "2023-01-30T23:10:52",
60226022
"parties": [
60236023
{
60246024
"type": "person",
@@ -6044,11 +6044,11 @@
60446044
"Topic :: Software Development :: Build Tools"
60456045
],
60466046
"homepage_url": "https://pip.pypa.io/",
6047-
"download_url": "https://files.pythonhosted.org/packages/09/bd/2410905c76ee14c62baf69e3f4aa780226c1bbfc9485731ad018e35b0cb5/pip-22.3.1-py3-none-any.whl",
6048-
"size": 2051534,
6047+
"download_url": "https://files.pythonhosted.org/packages/ab/43/508c403c38eeaa5fc86516eb13bb470ce77601b6d2bbcdb16e26328d0a15/pip-23.0-py3-none-any.whl",
6048+
"size": 2056044,
60496049
"sha1": null,
6050-
"md5": "74d0d338e0af6ca545d6ce7ef9734d75",
6051-
"sha256": "908c78e6bc29b676ede1c4d57981d490cb892eb45cd8c214ab6298125119e077",
6050+
"md5": "911a8561240e5b46c50b7e16834d42dd",
6051+
"sha256": "b5f88adff801f5ef052bcdef3daa31b55eb67b0fccd6d0106c206fa248e0463c",
60526052
"sha512": null,
60536053
"bug_tracking_url": null,
60546054
"code_view_url": "https://github.com/pypa/pip",
@@ -6068,20 +6068,20 @@
60686068
"dependencies": [],
60696069
"repository_homepage_url": null,
60706070
"repository_download_url": null,
6071-
"api_data_url": "https://pypi.org/pypi/pip/22.3.1/json",
6071+
"api_data_url": "https://pypi.org/pypi/pip/23.0/json",
60726072
"datasource_id": null,
6073-
"purl": "pkg:pypi/pip@22.3.1"
6073+
"purl": "pkg:pypi/pip@23.0"
60746074
},
60756075
{
60766076
"type": "pypi",
60776077
"namespace": null,
60786078
"name": "pip",
6079-
"version": "22.3.1",
6079+
"version": "23.0",
60806080
"qualifiers": {},
60816081
"subpath": null,
60826082
"primary_language": "Python",
60836083
"description": "The PyPA recommended tool for installing Python packages.\npip - The Python Package Installer\n==================================\n\n.. image:: https://img.shields.io/pypi/v/pip.svg\n :target: https://pypi.org/project/pip/\n\n.. image:: https://readthedocs.org/projects/pip/badge/?version=latest\n :target: https://pip.pypa.io/en/latest\n\npip is the `package installer`_ for Python. You can use pip to install packages from the `Python Package Index`_ and other indexes.\n\nPlease take a look at our documentation for how to install and use pip:\n\n* `Installation`_\n* `Usage`_\n\nWe release updates regularly, with a new version every 3 months. Find more details in our documentation:\n\n* `Release notes`_\n* `Release process`_\n\nIn pip 20.3, we've `made a big improvement to the heart of pip`_; `learn more`_. We want your input, so `sign up for our user experience research studies`_ to help us do it right.\n\n**Note**: pip 21.0, in January 2021, removed Python 2 support, per pip's `Python 2 support policy`_. Please migrate to Python 3.\n\nIf you find bugs, need help, or want to talk to the developers, please use our mailing lists or chat rooms:\n\n* `Issue tracking`_\n* `Discourse channel`_\n* `User IRC`_\n\nIf you want to get involved head over to GitHub to get the source code, look at our development documentation and feel free to jump on the developer mailing lists and chat rooms:\n\n* `GitHub page`_\n* `Development documentation`_\n* `Development IRC`_\n\nCode of Conduct\n---------------\n\nEveryone interacting in the pip project's codebases, issue trackers, chat\nrooms, and mailing lists is expected to follow the `PSF Code of Conduct`_.\n\n.. _package installer: https://packaging.python.org/guides/tool-recommendations/\n.. _Python Package Index: https://pypi.org\n.. _Installation: https://pip.pypa.io/en/stable/installation/\n.. _Usage: https://pip.pypa.io/en/stable/\n.. _Release notes: https://pip.pypa.io/en/stable/news.html\n.. _Release process: https://pip.pypa.io/en/latest/development/release-process/\n.. _GitHub page: https://github.com/pypa/pip\n.. _Development documentation: https://pip.pypa.io/en/latest/development\n.. _made a big improvement to the heart of pip: https://pyfound.blogspot.com/2020/11/pip-20-3-new-resolver.html\n.. _learn more: https://pip.pypa.io/en/latest/user_guide/#changes-to-the-pip-dependency-resolver-in-20-3-2020\n.. _sign up for our user experience research studies: https://pyfound.blogspot.com/2020/03/new-pip-resolver-to-roll-out-this-year.html\n.. _Python 2 support policy: https://pip.pypa.io/en/latest/development/release-process/#python-2-support\n.. _Issue tracking: https://github.com/pypa/pip/issues\n.. _Discourse channel: https://discuss.python.org/c/packaging\n.. _User IRC: https://kiwiirc.com/nextclient/#ircs://irc.libera.chat:+6697/pypa\n.. _Development IRC: https://kiwiirc.com/nextclient/#ircs://irc.libera.chat:+6697/pypa-dev\n.. _PSF Code of Conduct: https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md",
6084-
"release_date": "2022-11-05T15:56:20",
6084+
"release_date": "2023-01-30T23:10:56",
60856085
"parties": [
60866086
{
60876087
"type": "person",
@@ -6107,11 +6107,11 @@
61076107
"Topic :: Software Development :: Build Tools"
61086108
],
61096109
"homepage_url": "https://pip.pypa.io/",
6110-
"download_url": "https://files.pythonhosted.org/packages/a3/50/c4d2727b99052780aad92c7297465af5fe6eec2dbae490aa9763273ffdc1/pip-22.3.1.tar.gz",
6111-
"size": 2078129,
6110+
"download_url": "https://files.pythonhosted.org/packages/b5/16/5e24bf63cff51dcc169f43bd43b86b005c49941e09cc3482a5b370db239e/pip-23.0.tar.gz",
6111+
"size": 2082372,
61126112
"sha1": null,
6113-
"md5": "996f58a94fe0b8b82b6795c42bd171ba",
6114-
"sha256": "65fd48317359f3af8e593943e6ae1506b66325085ea64b706a998c6e83eeaf38",
6113+
"md5": "5d41b9679adae9362026b1753b543cb2",
6114+
"sha256": "aee438284e82c8def684b0bcc50b1f6ed5e941af97fa940e83e2e8ef1a59da9b",
61156115
"sha512": null,
61166116
"bug_tracking_url": null,
61176117
"code_view_url": "https://github.com/pypa/pip",
@@ -6131,9 +6131,9 @@
61316131
"dependencies": [],
61326132
"repository_homepage_url": null,
61336133
"repository_download_url": null,
6134-
"api_data_url": "https://pypi.org/pypi/pip/22.3.1/json",
6134+
"api_data_url": "https://pypi.org/pypi/pip/23.0/json",
61356135
"datasource_id": null,
6136-
"purl": "pkg:pypi/pip@22.3.1"
6136+
"purl": "pkg:pypi/pip@23.0"
61376137
},
61386138
{
61396139
"type": "pypi",
@@ -10940,7 +10940,7 @@
1094010940
{
1094110941
"key": "pip",
1094210942
"package_name": "pip",
10943-
"installed_version": "22.3.1",
10943+
"installed_version": "23.0",
1094410944
"dependencies": []
1094510945
}
1094610946
]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"files": [
1717
{
1818
"type": "file",
19-
"path": "/home/tg1999/Desktop/python-inspector-1/tests/data/insecure-setup-2/setup.py",
19+
"path": "/home/swastik/Desktop/Projects/python-inspector/tests/data/insecure-setup-2/setup.py",
2020
"package_data": [
2121
{
2222
"type": "pypi",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"files": [
1717
{
1818
"type": "file",
19-
"path": "/home/tg1999/Desktop/python-inspector-1/tests/data/insecure-setup/setup.py",
19+
"path": "/home/swastik/Desktop/Projects/python-inspector/tests/data/insecure-setup/setup.py",
2020
"package_data": [
2121
{
2222
"type": "pypi",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
55
"tool_version": "0.9.4",
66
"options": [
7-
"--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/pdt-requirements.txt",
7+
"--requirement /home/swastik/Desktop/Projects/python-inspector/tests/data/pdt-requirements.txt",
88
"--index-url https://pypi.org/simple",
99
"--python-version 38",
1010
"--operating-system linux",
@@ -17,7 +17,7 @@
1717
"files": [
1818
{
1919
"type": "file",
20-
"path": "/home/tg1999/Desktop/python-inspector-1/tests/data/pdt-requirements.txt",
20+
"path": "/home/swastik/Desktop/Projects/python-inspector/tests/data/pdt-requirements.txt",
2121
"package_data": [
2222
{
2323
"type": "pypi",

0 commit comments

Comments
 (0)