Skip to content

Commit 841d652

Browse files
Fix requirements updates related failures
Rollback some dependencies and update test failures for other dependency updates. Reference: #4447 Signed-off-by: Ayan Sinha Mahapatra <asmahapatra@aboutcode.org>
1 parent 7929f9b commit 841d652

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ html5lib==1.1
3030
id==1.5.0
3131
idna==3.11
3232
imagesize==1.4.1
33-
importlib_metadata==8.7.1
33+
importlib_metadata==6.2.1
3434
inflection==0.5.1
3535
intbitset==4.1.0
3636
jaraco.functools==4.4.0
@@ -63,7 +63,7 @@ py==1.11.0
6363
pyahocorasick==2.3.0
6464
pycparser==2.23
6565
pygmars==1.0.0
66-
Pygments==2.19.2
66+
Pygments==2.13.0
6767
pymaven-patch==0.3.2
6868
pyparsing==3.3.1
6969
pytz==2022.1

tests/packagedcode/data/npm/casepath/package.json.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,6 @@
396396
"repository_download_url": "https://registry.npmjs.org/casesensitivepathswebpackpluginDemo/-/casesensitivepathswebpackpluginDemo-0.0.1.tgz",
397397
"api_data_url": "https://registry.npmjs.org/casesensitivepathswebpackpluginDemo/0.0.1",
398398
"datasource_id": "npm_package_json",
399-
"purl": "pkg:npm/casesensitivepathswebpackpluginDemo@0.0.1"
399+
"purl": "pkg:npm/casesensitivepathswebpackplugindemo@0.0.1"
400400
}
401401
]

tests/packagedcode/data/npm/npm-shrinkwrap/npm-shrinkwrap.json-expected

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/packagedcode/data/phpcomposer/framework/composer.json.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@
703703
"extra_data": {}
704704
},
705705
{
706-
"purl": "pkg:composer/mikey179/vfsStream",
706+
"purl": "pkg:composer/mikey179/vfsstream",
707707
"extracted_requirement": "^1.6",
708708
"scope": "require-dev",
709709
"is_runtime": false,

tests/scancode/test_cli.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ def test_scan_with_timeout_errors():
240240
# we use a short timeout and a --test-slow-mode --email scan to simulate an error
241241
args = ['-e', '--test-slow-mode', '--timeout', '0.01', '--verbose',
242242
test_file, '--json', result_file]
243-
result = run_scan_click(args, expected_rc=1)
243+
result = run_scan_click(args, expected_rc=1, processes=None)
244244
assert 'ERROR: Processing interrupted: timeout' in result.output
245245
assert 'patchelf.pdf' in result.output
246246
result_json = json.loads(open(result_file).read())
@@ -891,7 +891,7 @@ def test_check_error_count():
891891
# we use a short timeout and a --test-slow-mode --email scan to simulate an error
892892
args = ['-e', '--test-slow-mode', '--timeout', '0.1',
893893
test_dir, '--json', result_file]
894-
result = run_scan_click(args, expected_rc=1)
894+
result = run_scan_click(args, expected_rc=1, processes=None)
895895
output = result.output
896896
output = output.replace('\n', ' ').replace(' ', ' ')
897897
output = output.split(' ')

0 commit comments

Comments
 (0)