Skip to content
Snippets Groups Projects
Unverified Commit 6c7316cd authored by Tobias's avatar Tobias Committed by GitHub
Browse files

feat(manager/pip_setup): set currentVersion field for exact dependency versions (#31021)

parent decdac9a
No related branches found
No related tags found
No related merge requests found
...@@ -61,6 +61,7 @@ setup( ...@@ -61,6 +61,7 @@ setup(
flask=[ flask=[
'flask>=0.11,<2.0', 'flask>=0.11,<2.0',
'blinker>=1.4,<2.0', 'blinker>=1.4,<2.0',
'flask2==1.2.3',
], ],
pg=[ pg=[
'sqlparse', 'sqlparse',
......
...@@ -75,12 +75,22 @@ exports[`modules/manager/pip_setup/extract extractPackageFile() returns found de ...@@ -75,12 +75,22 @@ exports[`modules/manager/pip_setup/extract extractPackageFile() returns found de
}, },
"packageName": "blinker", "packageName": "blinker",
}, },
{
"currentValue": "==1.2.3",
"currentVersion": "1.2.3",
"datasource": "pypi",
"depName": "flask2",
"managerData": {
"lineNumber": 63,
},
"packageName": "flask2",
},
{ {
"currentValue": ">=19.7.0,<20.0", "currentValue": ">=19.7.0,<20.0",
"datasource": "pypi", "datasource": "pypi",
"depName": "gunicorn", "depName": "gunicorn",
"managerData": { "managerData": {
"lineNumber": 74, "lineNumber": 75,
}, },
"packageName": "gunicorn", "packageName": "gunicorn",
}, },
...@@ -89,7 +99,7 @@ exports[`modules/manager/pip_setup/extract extractPackageFile() returns found de ...@@ -89,7 +99,7 @@ exports[`modules/manager/pip_setup/extract extractPackageFile() returns found de
"datasource": "pypi", "datasource": "pypi",
"depName": "Werkzeug", "depName": "Werkzeug",
"managerData": { "managerData": {
"lineNumber": 75, "lineNumber": 76,
}, },
"packageName": "werkzeug", "packageName": "werkzeug",
}, },
...@@ -98,7 +108,7 @@ exports[`modules/manager/pip_setup/extract extractPackageFile() returns found de ...@@ -98,7 +108,7 @@ exports[`modules/manager/pip_setup/extract extractPackageFile() returns found de
"datasource": "pypi", "datasource": "pypi",
"depName": "statsd", "depName": "statsd",
"managerData": { "managerData": {
"lineNumber": 75, "lineNumber": 76,
}, },
"packageName": "statsd", "packageName": "statsd",
}, },
...@@ -107,7 +117,7 @@ exports[`modules/manager/pip_setup/extract extractPackageFile() returns found de ...@@ -107,7 +117,7 @@ exports[`modules/manager/pip_setup/extract extractPackageFile() returns found de
"datasource": "pypi", "datasource": "pypi",
"depName": "requests", "depName": "requests",
"managerData": { "managerData": {
"lineNumber": 76, "lineNumber": 77,
}, },
"packageName": "requests", "packageName": "requests",
"skipReason": "ignored", "skipReason": "ignored",
...@@ -117,7 +127,7 @@ exports[`modules/manager/pip_setup/extract extractPackageFile() returns found de ...@@ -117,7 +127,7 @@ exports[`modules/manager/pip_setup/extract extractPackageFile() returns found de
"datasource": "pypi", "datasource": "pypi",
"depName": "raven", "depName": "raven",
"managerData": { "managerData": {
"lineNumber": 77, "lineNumber": 78,
}, },
"packageName": "raven", "packageName": "raven",
}, },
...@@ -126,7 +136,7 @@ exports[`modules/manager/pip_setup/extract extractPackageFile() returns found de ...@@ -126,7 +136,7 @@ exports[`modules/manager/pip_setup/extract extractPackageFile() returns found de
"datasource": "pypi", "datasource": "pypi",
"depName": "future", "depName": "future",
"managerData": { "managerData": {
"lineNumber": 78, "lineNumber": 79,
}, },
"packageName": "future", "packageName": "future",
}, },
...@@ -135,7 +145,7 @@ exports[`modules/manager/pip_setup/extract extractPackageFile() returns found de ...@@ -135,7 +145,7 @@ exports[`modules/manager/pip_setup/extract extractPackageFile() returns found de
"datasource": "pypi", "datasource": "pypi",
"depName": "ipaddress", "depName": "ipaddress",
"managerData": { "managerData": {
"lineNumber": 79, "lineNumber": 80,
}, },
"packageName": "ipaddress", "packageName": "ipaddress",
}, },
...@@ -144,7 +154,7 @@ exports[`modules/manager/pip_setup/extract extractPackageFile() returns found de ...@@ -144,7 +154,7 @@ exports[`modules/manager/pip_setup/extract extractPackageFile() returns found de
"datasource": "pypi", "datasource": "pypi",
"depName": "zope.interface", "depName": "zope.interface",
"managerData": { "managerData": {
"lineNumber": 80, "lineNumber": 81,
}, },
"packageName": "zope-interface", "packageName": "zope-interface",
}, },
......
...@@ -21,6 +21,7 @@ describe('modules/manager/pip_setup/extract', () => { ...@@ -21,6 +21,7 @@ describe('modules/manager/pip_setup/extract', () => {
{ depName: 'django', currentValue: '>=1.11.23,<2.0' }, { depName: 'django', currentValue: '>=1.11.23,<2.0' },
{ depName: 'flask', currentValue: '>=0.11,<2.0' }, { depName: 'flask', currentValue: '>=0.11,<2.0' },
{ depName: 'blinker', currentValue: '>=1.4,<2.0' }, { depName: 'blinker', currentValue: '>=1.4,<2.0' },
{ depName: 'flask2', currentValue: '==1.2.3' },
{ depName: 'gunicorn', currentValue: '>=19.7.0,<20.0' }, { depName: 'gunicorn', currentValue: '>=19.7.0,<20.0' },
{ depName: 'Werkzeug', currentValue: '>=0.15.3,<0.16' }, { depName: 'Werkzeug', currentValue: '>=0.15.3,<0.16' },
{ depName: 'statsd', currentValue: '>=3.2.1,<4.0' }, { depName: 'statsd', currentValue: '>=3.2.1,<4.0' },
......
...@@ -55,6 +55,10 @@ function depStringHandler( ...@@ -55,6 +55,10 @@ function depStringHandler(
datasource: PypiDatasource.id, datasource: PypiDatasource.id,
}; };
if (currentValue?.startsWith('==')) {
dep.currentVersion = currentValue.replace(regEx(/^==\s*/), '');
}
return { ...ctx, deps: [...ctx.deps, dep] }; return { ...ctx, deps: [...ctx.deps, dep] };
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment