Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
lilydjwg committed May 19, 2024
2 parents d49d074 + 3cf403f commit 2800f39
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 11 deletions.
2 changes: 2 additions & 0 deletions docs/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,8 @@ pypi
use_pre_release
Whether to accept pre release. Default is false.

This source supports :ref:`list options`.

.. note::
An additional dependency "packaging" is required.
You can use ``pip install 'nvchecker[pypi]'``.
Expand Down
25 changes: 14 additions & 11 deletions nvchecker_source/pypi.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,24 @@
from nvchecker.api import RichResult

async def get_version(name, conf, *, cache, **kwargs):
ret = []

package = conf.get('pypi') or name
use_pre_release = conf.get('use_pre_release', False)

url = 'https://pypi.org/pypi/{}/json'.format(package)

data = await cache.get_json(url)

if use_pre_release:
version = sorted(
data['releases'].keys(),
key = Version,
)[-1]
else:
version = data['info']['version']
return RichResult(
version = version,
url = f'https://pypi.org/project/{package}/{version}/',
)
for version in data['releases'].keys():
parsed_version = Version(version)

if not use_pre_release and parsed_version.is_prerelease:
continue

ret.append(RichResult(
version = version,
url = f'https://pypi.org/project/{package}/{version}/',
))

return ret
6 changes: 6 additions & 0 deletions tests/test_pypi.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@ async def test_pypi_pre_release(get_version):
"source": "pypi",
"use_pre_release": 1,
}) == "1.0.1a1"

async def test_pypi_list(get_version):
assert await get_version("urllib3", {
"source": "pypi",
"include_regex": "^1\\..*",
}) == "1.26.18"

0 comments on commit 2800f39

Please sign in to comment.