diff --git a/package-lock.json b/package-lock.json index 6a3c6666ec..dc937dce76 100644 --- a/package-lock.json +++ b/package-lock.json @@ -78,7 +78,7 @@ "snyk-nuget-plugin": "2.7.12", "snyk-php-plugin": "1.10.0", "snyk-policy": "4.1.4", - "snyk-python-plugin": "2.3.0", + "snyk-python-plugin": "2.4.3", "snyk-resolve-deps": "4.8.0", "snyk-sbt-plugin": "2.18.1", "snyk-swiftpm-plugin": "1.4.1", @@ -21345,15 +21345,15 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/snyk-python-plugin": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-2.3.0.tgz", - "integrity": "sha512-awJ/D59FfIQNXDBStHMgx6jqpWoShTaga64d0dXAtPhloMS6Wm7q39uqi2UN1zNem/Vsu+tm0iXdSX56G/2bEw==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-2.4.3.tgz", + "integrity": "sha512-3qZJWul5lerWFgHgG31FXTzez+sDnArN9R5j12XwazMH6YQ5XppvQsHawQZFlS16myMrq7v+sV53rGExTZHTzw==", "dependencies": { "@snyk/cli-interface": "^2.11.2", "@snyk/dep-graph": "^1.28.1", "shescape": "1.6.1", "snyk-poetry-lockfile-parser": "^1.6.1", - "tmp": "0.2.1" + "tmp": "0.2.3" } }, "node_modules/snyk-python-plugin/node_modules/@snyk/dep-graph": { @@ -21393,21 +21393,6 @@ "node": ">= 6" } }, - "node_modules/snyk-python-plugin/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/snyk-python-plugin/node_modules/semver": { "version": "7.6.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", @@ -21420,14 +21405,11 @@ } }, "node_modules/snyk-python-plugin/node_modules/tmp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", - "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", - "dependencies": { - "rimraf": "^3.0.0" - }, + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", + "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", "engines": { - "node": ">=8.17.0" + "node": ">=14.14" } }, "node_modules/snyk-resolve": { @@ -40655,15 +40637,15 @@ } }, "snyk-python-plugin": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-2.3.0.tgz", - "integrity": "sha512-awJ/D59FfIQNXDBStHMgx6jqpWoShTaga64d0dXAtPhloMS6Wm7q39uqi2UN1zNem/Vsu+tm0iXdSX56G/2bEw==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-2.4.3.tgz", + "integrity": "sha512-3qZJWul5lerWFgHgG31FXTzez+sDnArN9R5j12XwazMH6YQ5XppvQsHawQZFlS16myMrq7v+sV53rGExTZHTzw==", "requires": { "@snyk/cli-interface": "^2.11.2", "@snyk/dep-graph": "^1.28.1", "shescape": "1.6.1", "snyk-poetry-lockfile-parser": "^1.6.1", - "tmp": "0.2.1" + "tmp": "0.2.3" }, "dependencies": { "@snyk/dep-graph": { @@ -40697,26 +40679,15 @@ "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz", "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==" }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "requires": { - "glob": "^7.1.3" - } - }, "semver": { "version": "7.6.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==" }, "tmp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", - "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", - "requires": { - "rimraf": "^3.0.0" - } + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", + "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==" } } }, diff --git a/package.json b/package.json index c8406b8f65..2a3b40d086 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "snyk-nuget-plugin": "2.7.12", "snyk-php-plugin": "1.10.0", "snyk-policy": "4.1.4", - "snyk-python-plugin": "2.3.0", + "snyk-python-plugin": "2.4.3", "snyk-resolve-deps": "4.8.0", "snyk-sbt-plugin": "2.18.1", "snyk-swiftpm-plugin": "1.4.1", diff --git a/test/acceptance/workspaces/package-lock.json b/test/acceptance/workspaces/package-lock.json new file mode 100644 index 0000000000..1dac14d8e4 --- /dev/null +++ b/test/acceptance/workspaces/package-lock.json @@ -0,0 +1,13 @@ +{ + "name": "workspaces", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "workspaces", + "version": "1.0.0", + "license": "ISC" + } + } +} diff --git a/test/acceptance/workspaces/pip-app-linux-amd64/lib/jedi-0.19.2-py2.py3-none-any.whl b/test/acceptance/workspaces/pip-app-linux-amd64/lib/jedi-0.19.2-py2.py3-none-any.whl new file mode 100644 index 0000000000..77ef19d043 Binary files /dev/null and b/test/acceptance/workspaces/pip-app-linux-amd64/lib/jedi-0.19.2-py2.py3-none-any.whl differ diff --git a/test/acceptance/workspaces/pip-app-linux-amd64/requirements.txt b/test/acceptance/workspaces/pip-app-linux-amd64/requirements.txt index 7da2e73184..ae46f545c4 100644 --- a/test/acceptance/workspaces/pip-app-linux-amd64/requirements.txt +++ b/test/acceptance/workspaces/pip-app-linux-amd64/requirements.txt @@ -1 +1,2 @@ --r ./module/requirements.txt \ No newline at end of file +-r ./module/requirements.txt +./lib/jedi-0.19.2-py2.py3-none-any.whl \ No newline at end of file diff --git a/test/acceptance/workspaces/pip-app-linux-arm64/lib/jedi-0.19.2-py2.py3-none-any.whl b/test/acceptance/workspaces/pip-app-linux-arm64/lib/jedi-0.19.2-py2.py3-none-any.whl new file mode 100644 index 0000000000..77ef19d043 Binary files /dev/null and b/test/acceptance/workspaces/pip-app-linux-arm64/lib/jedi-0.19.2-py2.py3-none-any.whl differ diff --git a/test/acceptance/workspaces/pip-app-linux-arm64/requirements.txt b/test/acceptance/workspaces/pip-app-linux-arm64/requirements.txt index 7da2e73184..ae46f545c4 100644 --- a/test/acceptance/workspaces/pip-app-linux-arm64/requirements.txt +++ b/test/acceptance/workspaces/pip-app-linux-arm64/requirements.txt @@ -1 +1,2 @@ --r ./module/requirements.txt \ No newline at end of file +-r ./module/requirements.txt +./lib/jedi-0.19.2-py2.py3-none-any.whl \ No newline at end of file diff --git a/test/acceptance/workspaces/pip-app-macos/lib/jedi-0.19.2-py2.py3-none-any.whl b/test/acceptance/workspaces/pip-app-macos/lib/jedi-0.19.2-py2.py3-none-any.whl new file mode 100644 index 0000000000..77ef19d043 Binary files /dev/null and b/test/acceptance/workspaces/pip-app-macos/lib/jedi-0.19.2-py2.py3-none-any.whl differ diff --git a/test/acceptance/workspaces/pip-app-macos/requirements.txt b/test/acceptance/workspaces/pip-app-macos/requirements.txt index 7da2e73184..ae46f545c4 100644 --- a/test/acceptance/workspaces/pip-app-macos/requirements.txt +++ b/test/acceptance/workspaces/pip-app-macos/requirements.txt @@ -1 +1,2 @@ --r ./module/requirements.txt \ No newline at end of file +-r ./module/requirements.txt +./lib/jedi-0.19.2-py2.py3-none-any.whl \ No newline at end of file diff --git a/test/acceptance/workspaces/pip-app-robust/jedi-0.19.2-py2.py3-none-any.whl b/test/acceptance/workspaces/pip-app-robust/jedi-0.19.2-py2.py3-none-any.whl new file mode 100644 index 0000000000..77ef19d043 Binary files /dev/null and b/test/acceptance/workspaces/pip-app-robust/jedi-0.19.2-py2.py3-none-any.whl differ diff --git a/test/acceptance/workspaces/pip-app-robust/requirements.txt b/test/acceptance/workspaces/pip-app-robust/requirements.txt index a6e12c8913..1b25a6494b 100644 --- a/test/acceptance/workspaces/pip-app-robust/requirements.txt +++ b/test/acceptance/workspaces/pip-app-robust/requirements.txt @@ -8,4 +8,5 @@ requests; python_version >= "3.8.dev0" pydantic[email]==1.9.0 djangorestframework @ git+https://github.com/encode/django-rest-framework.git@1db19f4b2d1500894448634852e02f73043382e4 -r req.txt --c constraints.txt \ No newline at end of file +-c constraints.txt +jedi-0.19.2-py2.py3-none-any.whl \ No newline at end of file diff --git a/test/acceptance/workspaces/pip-app-windows/lib/jedi-0.19.2-py2.py3-none-any.whl b/test/acceptance/workspaces/pip-app-windows/lib/jedi-0.19.2-py2.py3-none-any.whl new file mode 100644 index 0000000000..77ef19d043 Binary files /dev/null and b/test/acceptance/workspaces/pip-app-windows/lib/jedi-0.19.2-py2.py3-none-any.whl differ diff --git a/test/acceptance/workspaces/pip-app-windows/requirements.txt b/test/acceptance/workspaces/pip-app-windows/requirements.txt index f062afc54b..c36a88351f 100644 --- a/test/acceptance/workspaces/pip-app-windows/requirements.txt +++ b/test/acceptance/workspaces/pip-app-windows/requirements.txt @@ -1,2 +1,3 @@ pywin32; sys_platform == 'win32' --r module\requirements.txt \ No newline at end of file +-r module\requirements.txt +lib\jedi-0.19.2-py2.py3-none-any.whl \ No newline at end of file