Skip to content

Commit 042f5db

Browse files
TG1999TG1999
authored
Fix CI configuration (aboutcode-org#158)
* Fix tests Signed-off-by: Tushar Goel <[email protected]> * Fix tests for windows Replace backslash with forward-slash Signed-off-by: Tushar Goel <[email protected]> * Regen test output Signed-off-by: Tushar Goel <[email protected]> --------- Signed-off-by: Tushar Goel <[email protected]>
1 parent 5e3cdf0 commit 042f5db

8 files changed

+201
-210
lines changed

‎azure-pipelines.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,13 @@ jobs:
3636
job_name: macos12_cpython
3737
image_name: macOS-12
3838
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
39-
test_suites:
40-
all: venv/bin/pytest -n 2 -vvs
41-
42-
- template: etc/ci/azure-posix.yml
43-
parameters:
44-
job_name: macos13_cpython
45-
image_name: macOS-13
46-
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
4739
test_suites:
4840
all: venv/bin/pytest -n 2 -vvs --reruns 2
4941

5042
- template: etc/ci/azure-posix.yml
5143
parameters:
52-
job_name: macos12_cpython
53-
image_name: macos-12
44+
job_name: macos13_cpython
45+
image_name: macos-13
5446
python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
5547
test_suites:
5648
all: venv/bin/pytest -n 2 -vvs --reruns 2

‎setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ testing =
8585
twine
8686
black
8787
isort
88+
pytest-rerunfailures
8889

8990
docs =
9091
Sphinx>=5.0.2

‎src/python_inspector/utils.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,10 @@ def remove_test_data_dir_variable_prefix(path, placeholder="<file>"):
7979
Return a clean path, removing variable test path prefix or using a ``placeholder``.
8080
Used for testing to ensure that results are stable across runs.
8181
"""
82+
path = path.replace("\\", "/")
8283
if "tests/data/" in path:
8384
_junk, test_dir, cleaned = path.partition("tests/data/")
84-
return f"{test_dir}{cleaned}"
85+
cleaned = f"{test_dir}{cleaned}"
86+
return cleaned.replace("\\", "/")
8587
else:
8688
return placeholder

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

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

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

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

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

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

‎tests/data/single-url-except-simple-expected.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
"type": "pypi",
2121
"namespace": null,
2222
"name": "blinker",
23-
"version": "1.6.3",
23+
"version": "1.7.0",
2424
"qualifiers": {},
2525
"subpath": null,
2626
"primary_language": "Python",
2727
"description": "Fast, simple object-to-object and broadcast signaling\nBlinker\n=======\n\nBlinker provides a fast dispatching system that allows any number of\ninterested parties to subscribe to events, or \"signals\".\n\nSignal receivers can subscribe to specific senders or receive signals\nsent by any sender.\n\n.. code-block:: pycon\n\n >>> from blinker import signal\n >>> started = signal('round-started')\n >>> def each(round):\n ... print(f\"Round {round}\")\n ...\n >>> started.connect(each)\n\n >>> def round_two(round):\n ... print(\"This is round two.\")\n ...\n >>> started.connect(round_two, sender=2)\n\n >>> for round in range(1, 4):\n ... started.send(round)\n ...\n Round 1!\n Round 2!\n This is round two.\n Round 3!\n\n\nLinks\n-----\n\n- Documentation: https://blinker.readthedocs.io/\n- Changes: https://blinker.readthedocs.io/#changes\n- PyPI Releases: https://pypi.org/project/blinker/\n- Source Code: https://github.com/pallets-eco/blinker/\n- Issue Tracker: https://github.com/pallets-eco/blinker/issues/",
28-
"release_date": "2023-10-07T14:16:19",
28+
"release_date": "2023-11-01T22:06:00",
2929
"parties": [
3030
{
3131
"type": "person",
@@ -54,11 +54,11 @@
5454
"Topic :: Software Development :: Libraries"
5555
],
5656
"homepage_url": "",
57-
"download_url": "https://files.pythonhosted.org/packages/bf/2b/11bcedb7dee4923253a4a21bae3be854bcc4f06295bd827756352016d97c/blinker-1.6.3-py3-none-any.whl",
58-
"size": 13398,
57+
"download_url": "https://files.pythonhosted.org/packages/fa/2a/7f3714cbc6356a0efec525ce7a0613d581072ed6eb53eb7b9754f33db807/blinker-1.7.0-py3-none-any.whl",
58+
"size": 13068,
5959
"sha1": null,
60-
"md5": "4ab7b0e126ce1c1b364e41807d477d7e",
61-
"sha256": "296320d6c28b006eb5e32d4712202dbcdcbf5dc482da298c2f44881c43884aaa",
60+
"md5": "1e62cc24a24ad42ba12fb576f5c5ce89",
61+
"sha256": "c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9",
6262
"sha512": null,
6363
"bug_tracking_url": "https://github.com/pallets-eco/blinker/issues/",
6464
"code_view_url": "https://github.com/pallets-eco/blinker/",
@@ -77,20 +77,20 @@
7777
"dependencies": [],
7878
"repository_homepage_url": null,
7979
"repository_download_url": null,
80-
"api_data_url": "https://pypi.org/pypi/blinker/1.6.3/json",
80+
"api_data_url": "https://pypi.org/pypi/blinker/1.7.0/json",
8181
"datasource_id": null,
82-
"purl": "pkg:pypi/blinker@1.6.3"
82+
"purl": "pkg:pypi/blinker@1.7.0"
8383
},
8484
{
8585
"type": "pypi",
8686
"namespace": null,
8787
"name": "blinker",
88-
"version": "1.6.3",
88+
"version": "1.7.0",
8989
"qualifiers": {},
9090
"subpath": null,
9191
"primary_language": "Python",
9292
"description": "Fast, simple object-to-object and broadcast signaling\nBlinker\n=======\n\nBlinker provides a fast dispatching system that allows any number of\ninterested parties to subscribe to events, or \"signals\".\n\nSignal receivers can subscribe to specific senders or receive signals\nsent by any sender.\n\n.. code-block:: pycon\n\n >>> from blinker import signal\n >>> started = signal('round-started')\n >>> def each(round):\n ... print(f\"Round {round}\")\n ...\n >>> started.connect(each)\n\n >>> def round_two(round):\n ... print(\"This is round two.\")\n ...\n >>> started.connect(round_two, sender=2)\n\n >>> for round in range(1, 4):\n ... started.send(round)\n ...\n Round 1!\n Round 2!\n This is round two.\n Round 3!\n\n\nLinks\n-----\n\n- Documentation: https://blinker.readthedocs.io/\n- Changes: https://blinker.readthedocs.io/#changes\n- PyPI Releases: https://pypi.org/project/blinker/\n- Source Code: https://github.com/pallets-eco/blinker/\n- Issue Tracker: https://github.com/pallets-eco/blinker/issues/",
93-
"release_date": "2023-10-07T14:16:21",
93+
"release_date": "2023-11-01T22:06:01",
9494
"parties": [
9595
{
9696
"type": "person",
@@ -119,11 +119,11 @@
119119
"Topic :: Software Development :: Libraries"
120120
],
121121
"homepage_url": "",
122-
"download_url": "https://files.pythonhosted.org/packages/ea/96/ed1420a974540da7419094f2553bc198c454cee5f72576e7c7629dd12d6e/blinker-1.6.3.tar.gz",
123-
"size": 28092,
122+
"download_url": "https://files.pythonhosted.org/packages/a1/13/6df5fc090ff4e5d246baf1f45fe9e5623aa8565757dfa5bd243f6a545f9e/blinker-1.7.0.tar.gz",
123+
"size": 28134,
124124
"sha1": null,
125-
"md5": "911d92a757f609b4344c04c207affea4",
126-
"sha256": "152090d27c1c5c722ee7e48504b02d76502811ce02e1523553b4cf8c8b3d3a8d",
125+
"md5": "0306b831281e9918ffb0ac6e3e18b47f",
126+
"sha256": "e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182",
127127
"sha512": null,
128128
"bug_tracking_url": "https://github.com/pallets-eco/blinker/issues/",
129129
"code_view_url": "https://github.com/pallets-eco/blinker/",
@@ -142,9 +142,9 @@
142142
"dependencies": [],
143143
"repository_homepage_url": null,
144144
"repository_download_url": null,
145-
"api_data_url": "https://pypi.org/pypi/blinker/1.6.3/json",
145+
"api_data_url": "https://pypi.org/pypi/blinker/1.7.0/json",
146146
"datasource_id": null,
147-
"purl": "pkg:pypi/blinker@1.6.3"
147+
"purl": "pkg:pypi/blinker@1.7.0"
148148
},
149149
{
150150
"type": "pypi",
@@ -1069,7 +1069,7 @@
10691069
],
10701070
"resolved_dependencies_graph": [
10711071
{
1072-
"package": "pkg:pypi/blinker@1.6.3",
1072+
"package": "pkg:pypi/blinker@1.7.0",
10731073
"dependencies": []
10741074
},
10751075
{
@@ -1079,7 +1079,7 @@
10791079
{
10801080
"package": "pkg:pypi/[email protected]",
10811081
"dependencies": [
1082-
"pkg:pypi/blinker@1.6.3",
1082+
"pkg:pypi/blinker@1.7.0",
10831083
"pkg:pypi/[email protected]",
10841084
"pkg:pypi/[email protected]",
10851085
"pkg:pypi/[email protected]",

‎tests/test_resolution.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def test_get_resolved_dependencies_for_version_containing_local_version_identifi
152152
assert plist == [
153153
"pkg:pypi/[email protected]",
154154
"pkg:pypi/[email protected]",
155-
"pkg:pypi/[email protected].2",
155+
"pkg:pypi/[email protected].3",
156156
"pkg:pypi/[email protected]",
157157
"pkg:pypi/[email protected]",
158158
"pkg:pypi/[email protected]",

0 commit comments

Comments
 (0)