bitbucket: 1.0 API is gone, let's use 2.0

fixes #109
This commit is contained in:
lilydjwg 2019-07-04 16:39:49 +08:00
parent b1856f7426
commit 3194ef8e6c
2 changed files with 27 additions and 5 deletions

View File

@ -330,6 +330,10 @@ use_max_tag
ignored_tags, sort_version_key
Deprecated. Use `list options`_ instead.
max_page
How many pages do we search for the max tag? Default is 3. This works when
``use_max_tag`` is set.
This source supports `list options`_ when ``use_max_tag`` is set.
Check GitLab

View File

@ -1,12 +1,12 @@
# MIT licensed
# Copyright (c) 2013-2017 lilydjwg <lilydjwg@gmail.com>, et al.
# Copyright (c) 2013-2019 lilydjwg <lilydjwg@gmail.com>, et al.
from . import session
from ..sortversion import sort_version_keys
# doc: https://confluence.atlassian.com/display/BITBUCKET/commits+or+commit+Resource
BITBUCKET_URL = 'https://bitbucket.org/api/2.0/repositories/%s/commits/%s'
BITBUCKET_MAX_TAG = 'https://bitbucket.org/api/1.0/repositories/%s/tags'
BITBUCKET_MAX_TAG = 'https://bitbucket.org/api/2.0/repositories/%s/refs/tags'
async def get_version(name, conf, **kwargs):
repo = conf.get('bitbucket')
@ -14,13 +14,16 @@ async def get_version(name, conf, **kwargs):
use_max_tag = conf.getboolean('use_max_tag', False)
ignored_tags = conf.get("ignored_tags", "").split()
sort_version_key = sort_version_keys[conf.get("sort_version_key", "parse_version")]
if use_max_tag:
url = BITBUCKET_MAX_TAG % repo
max_page = conf.getint('max_page', 3)
data = await _get_tags(url, max_page=max_page)
else:
url = BITBUCKET_URL % (repo, br)
async with session.get(url) as res:
data = await res.json()
async with session.get(url) as res:
data = await res.json()
if use_max_tag:
data = [tag for tag in data if tag not in ignored_tags]
@ -29,3 +32,18 @@ async def get_version(name, conf, **kwargs):
else:
version = data['values'][0]['date'].split('T', 1)[0].replace('-', '')
return version
async def _get_tags(url, *, max_page):
ret = []
while True:
async with session.get(url) as res:
data = await res.json()
ret.extend(x['name'] for x in data['values'])
if 'next' in data:
url = data['next']
else:
break
return ret