Bump ynh
number on non-main-asset-only updates.
This commit is contained in:
parent
14c87cb82b
commit
b21e4ea9fa
2 changed files with 15 additions and 8 deletions
|
@ -256,6 +256,9 @@ class AppAutoUpdater:
|
||||||
if state == State.up_to_date:
|
if state == State.up_to_date:
|
||||||
return (State.up_to_date, "", "", "")
|
return (State.up_to_date, "", "", "")
|
||||||
|
|
||||||
|
if main_version == "":
|
||||||
|
self.repo.manifest_raw = self.bump_version(self.repo.manifest_raw, self.current_version, bump_ynh_level=True)
|
||||||
|
|
||||||
if edit:
|
if edit:
|
||||||
self.repo.edit_manifest(self.repo.manifest_raw)
|
self.repo.edit_manifest(self.repo.manifest_raw)
|
||||||
|
|
||||||
|
@ -580,19 +583,24 @@ class AppAutoUpdater:
|
||||||
]
|
]
|
||||||
|
|
||||||
if is_main:
|
if is_main:
|
||||||
|
content = self.bump_version(content, new_version)
|
||||||
def repl(m: re.Match) -> str:
|
|
||||||
return m.group(1) + new_version + '~ynh1"'
|
|
||||||
|
|
||||||
content = re.sub(
|
|
||||||
r"(\s*version\s*=\s*[\"\'])([^~\"\']+)(\~ynh\d+[\"\'])", repl, content
|
|
||||||
)
|
|
||||||
|
|
||||||
for old, new in replacements:
|
for old, new in replacements:
|
||||||
content = content.replace(old, new)
|
content = content.replace(old, new)
|
||||||
|
|
||||||
return content
|
return content
|
||||||
|
|
||||||
|
def bump_version(self, content: str, new_version: str, bump_ynh_level: bool = False) -> str:
|
||||||
|
ynh_level = 1
|
||||||
|
if bump_ynh_level:
|
||||||
|
ynh_level = int(re.search(r"\s*version\s*=\s*[\"\'][^~\"\']+~ynh(\d+)[\"\']", content).group(1)) + 1
|
||||||
|
|
||||||
|
def repl(m: re.Match) -> str:
|
||||||
|
return m.group(1) + new_version + f'~ynh{ynh_level}"'
|
||||||
|
|
||||||
|
return re.sub(
|
||||||
|
r"(\s*version\s*=\s*[\"\'])([^~\"\']+)(~ynh\d+[\"\'])", repl, content
|
||||||
|
)
|
||||||
|
|
||||||
def paste_on_haste(data):
|
def paste_on_haste(data):
|
||||||
# NB: we hardcode this here and can't use the yunopaste command
|
# NB: we hardcode this here and can't use the yunopaste command
|
||||||
|
|
|
@ -2,4 +2,3 @@ requests
|
||||||
PyGithub
|
PyGithub
|
||||||
toml
|
toml
|
||||||
tqdm
|
tqdm
|
||||||
GitPython
|
|
Loading…
Reference in a new issue