jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1181224?usp=email )
Change subject: coverage: update coverage settings
......................................................................
coverage: update coverage settings
- remove Users which was used by Appveyor
- remove some scripts after script tests are covered now
- remove "pragma: no cover" directive from several pywikibot scripts;
they should be adjusted after script tests are covered now
Change-Id: Ia153cf771b3086ea8bece36edab0f4fbb93c5c32
---
M .codecov.yml
M pywikibot/scripts/generate_family_file.py
M pywikibot/scripts/generate_user_files.py
M pywikibot/scripts/shell.py
M pywikibot/scripts/wrapper.py
5 files changed, 26 insertions(+), 29 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/.codecov.yml b/.codecov.yml
index 9d56b91..71869ff 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -19,13 +19,9 @@
default:
enabled: true
ignore:
- - Users
- pywikibot/daemonize.py
- pywikibot/families/__init__.py
- - pywikibot/scripts/version.py
- scripts/create_isbn_edition.py
- - scripts/maintenance/colors.py
- - scripts/maintenance/make_i18n_dict.py
- scripts/userscripts/
- tests/pwb/
notify:
diff --git a/pywikibot/scripts/generate_family_file.py
b/pywikibot/scripts/generate_family_file.py
index f09046d..1c38213 100755
--- a/pywikibot/scripts/generate_family_file.py
+++ b/pywikibot/scripts/generate_family_file.py
@@ -102,7 +102,7 @@
"""Wrapper around print to be mocked in tests."""
print(*args, **kwargs)
- def get_params(self) -> bool: # pragma: no cover
+ def get_params(self) -> bool:
"""Ask for parameters if necessary."""
if self.base_url is None:
with suppress(KeyboardInterrupt):
@@ -147,7 +147,7 @@
break
else:
return w, verify
- return None, None # pragma: no cover
+ return None, None
def run(self) -> None:
"""Main method, generate family file."""
@@ -182,7 +182,7 @@
self.langs = w.langs
self.show(fill(' '.join(sorted(wiki['prefix']
for wiki in self.langs))))
- except Exception as e: # pragma: no cover
+ except Exception as e:
self.langs = []
self.show(e, '; continuing...')
@@ -197,7 +197,7 @@
code_len = len(self.langs)
if code_len > 1:
if self.dointerwiki is None:
- while True: # pragma: no cover
+ while True:
makeiw = input(
'\n'
f'There are {code_len} sites available.'
@@ -225,7 +225,7 @@
self.langs = [wiki for wiki in self.langs
if domain in wiki['url']]
- elif makeiw == 'e': # pragma: no cover
+ elif makeiw == 'e':
for wiki in self.langs:
self.show(wiki['prefix'], wiki['url'])
do_langs = re.split(' *,| +',
@@ -251,7 +251,7 @@
try:
self.wikis[key] = self.Wiki(lang['url'])
self.show('downloaded')
- except Exception as e: # pragma: no cover
+ except Exception as e:
self.show(e)
remove.append(lang)
else:
@@ -260,7 +260,7 @@
for lang in remove:
self.langs.remove(lang)
- def writefile(self, verify) -> None: # pragma: no cover
+ def writefile(self, verify) -> None:
"""Write the family file."""
fp = Path(self.base_dir, 'families', f'{self.name}_family.py')
self.show(f'Writing {fp}... ')
diff --git a/pywikibot/scripts/generate_user_files.py
b/pywikibot/scripts/generate_user_files.py
index 9d96aef..1395768 100755
--- a/pywikibot/scripts/generate_user_files.py
+++ b/pywikibot/scripts/generate_user_files.py
@@ -311,7 +311,7 @@
select = pywikibot.input_choice(
f'Do you want to select {variant} setting sections?',
answers, default=default, force=force, automatic_quit=False)
- if select == 'h': # pragma: no cover
+ if select == 'h':
answers.pop(-1)
pywikibot.info(
f'The following {variant} setting sections are provided:')
@@ -324,7 +324,7 @@
choice = {'a': 'all', 'n': 'none', 'y': 'h'}[select] # mapping
for item in filter(skip, sections):
answers = [('Yes', 'y'), ('No', 'n'), ('Help', 'h')]
- while choice == 'h': # pragma: no cover
+ while choice == 'h':
choice = pywikibot.input_choice(
f'Do you want to add {item.head} section?',
answers, default='n', force=force, automatic_quit=False)
@@ -350,7 +350,7 @@
main_code: str,
main_username: str,
force: bool = False
-) -> None: # pragma: no cover
+) -> None:
"""Create a user-config.py in base_dir.
Create a user-password.py if necessary.
@@ -440,7 +440,7 @@
def save_botpasswords(botpasswords: str,
- path: Path) -> None: # pragma: no cover
+ path: Path) -> None:
"""Write botpasswords to file.
:param botpasswords: botpasswords for password file
diff --git a/pywikibot/scripts/shell.py b/pywikibot/scripts/shell.py
index b5e8331..487bcab 100755
--- a/pywikibot/scripts/shell.py
+++ b/pywikibot/scripts/shell.py
@@ -26,7 +26,7 @@
import sys
-def main(*args: str) -> None: # pragma: no cover
+def main(*args: str) -> None:
"""Script entry point.
.. versionchanged:: 8.2
diff --git a/pywikibot/scripts/wrapper.py b/pywikibot/scripts/wrapper.py
index d4b0081..eff65f6 100755
--- a/pywikibot/scripts/wrapper.py
+++ b/pywikibot/scripts/wrapper.py
@@ -77,13 +77,13 @@
scripts_version = Version(getattr(package, '__version__', pwb.__version__))
wikibot_version = Version(pwb.__version__)
- if scripts_version.release > wikibot_version.release: # pragma: no cover
+ if scripts_version.release > wikibot_version.release:
print(f'WARNING: Pywikibot version {wikibot_version} is behind '
f'scripts package version {scripts_version}.\n'
'Your Pywikibot may need an update or be misconfigured.\n')
# calculate previous minor release
- if wikibot_version.minor > 0: # pragma: no cover
+ if wikibot_version.minor > 0:
prev_wikibot = Version(
f'{wikibot_version.major}.{wikibot_version.minor - 1}.'
f'{wikibot_version.micro}'
@@ -94,7 +94,7 @@
f'behind legacy Pywikibot version {prev_wikibot} and '
f'current version {wikibot_version}\n'
'Your scripts may need an update or be misconfigured.\n')
- elif scripts_version.release < wikibot_version.release: # pragma: no cover
+ elif scripts_version.release < wikibot_version.release:
print(f'WARNING: Scripts package version {scripts_version} is behind '
f'current version {wikibot_version}\n'
'Your scripts may need an update or be misconfigured.\n')
@@ -141,7 +141,7 @@
# set environment values
old_env = os.environ.copy()
- for key, value in environ: # pragma: no cover
+ for key, value in environ:
os.environ[key] = value
sys.argv = [filename, *args]
@@ -165,7 +165,7 @@
# end of snippet from coverage
# Restore environment values
- for key, value in environ: # pragma: no cover
+ for key, value in environ:
if key in old_env:
os.environ[key] = old_env[key]
else:
@@ -210,7 +210,7 @@
def _print_requirements(requirements,
script,
- variant) -> None: # pragma: no cover
+ variant) -> None:
"""Print pip command to install requirements."""
if not requirements:
return
@@ -341,7 +341,7 @@
scripts = {}
for folder in script_paths:
- if not folder.exists(): # pragma: no cover
+ if not folder.exists():
warning(
f'{folder} does not exists; remove it from user_script_paths')
continue
@@ -376,7 +376,7 @@
alternatives, default='1')
except QuitKeyboardInterrupt:
return None
- print() # pragma: no cover
+ print()
return str(scripts[script])
@@ -406,7 +406,7 @@
# search through user scripts paths
user_script_paths = ['']
- if config.user_script_paths: # pragma: no cover
+ if config.user_script_paths:
if isinstance(config.user_script_paths, list):
user_script_paths += config.user_script_paths
else:
@@ -415,10 +415,11 @@
' Ignoring this setting.', stacklevel=2)
found = test_paths(user_script_paths, Path(config.base_dir))
- if found: # pragma: no cover
+ if found:
return found
- if site_package: # search for entry points
+ if site_package: # pragma: no cover
+ # search for entry points
import importlib
from importlib.metadata import entry_points
@@ -477,7 +478,7 @@
if global_args: # don't use sys.argv
unknown_args = pwb.handle_args(global_args)
- if unknown_args: # pragma: no cover
+ if unknown_args:
print('ERROR: unknown pwb.py argument{}: {}\n'
.format('' if len(unknown_args) == 1 else 's',
', '.join(unknown_args)))
@@ -535,7 +536,7 @@
.. versionchanged:: 7.0
previous implementation was renamed to :func:`execute`
"""
- if not check_modules(): # pragma: no cover
+ if not check_modules():
sys.exit()
if not execute():
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1181224?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Ia153cf771b3086ea8bece36edab0f4fbb93c5c32
Gerrit-Change-Number: 1181224
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
