Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pypi] Service calls according to new Warehouse API #8251

Merged
merged 1 commit into from
Jul 28, 2022
Merged

[pypi] Service calls according to new Warehouse API #8251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions services/pypi/pypi-base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,11 @@ const schema = Joi.object({
license: Joi.string().allow('').allow(null),
classifiers: Joi.array().items(Joi.string()).required(),
}).required(),
releases: Joi.object()
.pattern(
Joi.string(),
Joi.array()
.items(
Joi.object({
packagetype: Joi.string().required(),
})
)
.required()
urls: Joi.array()
.items(
Joi.object({
packagetype: Joi.string().required(),
})
)
.required(),
}).required()
Expand Down
10 changes: 3 additions & 7 deletions services/pypi/pypi-helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,12 @@ function getLicenses(packageData) {
}

function getPackageFormats(packageData) {
const {
info: { version },
releases,
} = packageData
const releasesForVersion = releases[version]
const { urls } = packageData
return {
hasWheel: releasesForVersion.some(({ packagetype }) =>
hasWheel: urls.some(({ packagetype }) =>
['wheel', 'bdist_wheel'].includes(packagetype)
),
hasEgg: releasesForVersion.some(({ packagetype }) =>
hasEgg: urls.some(({ packagetype }) =>
['egg', 'bdist_egg'].includes(packagetype)
),
}
Expand Down
31 changes: 7 additions & 24 deletions services/pypi/pypi-helpers.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,34 +164,17 @@ describe('PyPI helpers', function () {

test(getPackageFormats, () => {
given({
info: { version: '2.19.1' },
releases: {
'1.0.4': [{ packagetype: 'sdist' }],
'2.19.1': [{ packagetype: 'bdist_wheel' }, { packagetype: 'sdist' }],
},
urls: [{ packagetype: 'bdist_wheel' }, { packagetype: 'sdist' }],
}).expect({ hasWheel: true, hasEgg: false })
given({
info: { version: '1.0.4' },
releases: {
'1.0.4': [{ packagetype: 'sdist' }],
'2.19.1': [{ packagetype: 'bdist_wheel' }, { packagetype: 'sdist' }],
},
urls: [{ packagetype: 'sdist' }],
}).expect({ hasWheel: false, hasEgg: false })
given({
info: { version: '0.8.2' },
releases: {
0.8: [{ packagetype: 'sdist' }],
'0.8.1': [
{ packagetype: 'bdist_egg' },
{ packagetype: 'bdist_egg' },
{ packagetype: 'sdist' },
],
'0.8.2': [
{ packagetype: 'bdist_egg' },
{ packagetype: 'bdist_egg' },
{ packagetype: 'sdist' },
],
},
urls: [
{ packagetype: 'bdist_egg' },
{ packagetype: 'bdist_egg' },
{ packagetype: 'sdist' },
],
}).expect({ hasWheel: false, hasEgg: true })
})
})
4 changes: 2 additions & 2 deletions services/pypi/pypi-license.tester.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ t.create('license (from trove classifier)')
license: '',
classifiers: ['License :: OSI Approved :: MIT License'],
},
releases: {},
urls: [],
})
)
.expectBadge({
Expand All @@ -46,7 +46,7 @@ t.create('license (as acronym from trove classifier)')
'License :: OSI Approved :: GNU General Public License (GPL)',
],
},
releases: {},
urls: [],
})
)
.expectBadge({
Expand Down
2 changes: 1 addition & 1 deletion services/pypi/pypi-version.tester.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ t.create('no trove classifiers')
license: 'foo',
classifiers: [],
},
releases: {},
urls: [],
})
)
.expectBadge({
Expand Down