Pywikibot-commits February 2021

pywikibot-commits@lists.wikimedia.org

1 participants
134 discussions

[Gerrit] ...core[master]: [tests] Try upgrading pip with suggested command

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/663018 ) Change subject: [tests] Try upgrading pip with suggested command ...................................................................... [tests] Try upgrading pip with suggested command Change-Id: I0bc5c40fb8d123f391fef799856f4626b91b3d3a --- M .appveyor.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index e704f80..0d6a3c0 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -76,7 +76,7 @@ # Download Python version which isn't pre-installed - ps: ./appveyor_install.ps1 - python --version - - pip install --upgrade pip + - python -m pip install --upgrade pip - python -m venv env - env\Scripts\activate.bat - pip install -r requirements.txt -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/663018 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I0bc5c40fb8d123f391fef799856f4626b91b3d3a Gerrit-Change-Number: 663018 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: [tests] Reorder python commands

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/663015 ) Change subject: [tests] Reorder python commands ...................................................................... [tests] Reorder python commands Change-Id: I48da62caef1123033293cc3db2f3de672f8c8190 --- M .appveyor.yml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index 800b75e..e704f80 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -75,10 +75,10 @@ - mkdir appveyor # Download Python version which isn't pre-installed - ps: ./appveyor_install.ps1 - - python -m venv env - python --version - - env\Scripts\activate.bat - pip install --upgrade pip + - python -m venv env + - env\Scripts\activate.bat - pip install -r requirements.txt - pip install -r dev-requirements.txt -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/663015 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I48da62caef1123033293cc3db2f3de672f8c8190 Gerrit-Change-Number: 663015 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: [L10N] Update languages_by_size

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/663007 ) Change subject: [L10N] Update languages_by_size ...................................................................... [L10N] Update languages_by_size Change-Id: I538e0246ba73c268929d49c59f3d15627f57753c --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikinews_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wiktionary_family.py 6 files changed, 40 insertions(+), 40 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index fe8d5ab..ffb0e17 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -31,10 +31,10 @@ languages_by_size = [ 'en', 'hu', 'de', 'fr', 'it', 'pt', 'ja', 'es', 'nl', 'pl', 'id', 'he', 'fi', 'zh', 'sq', 'az', 'fa', 'vi', 'ru', 'ca', 'eu', 'da', 'ko', 'ba', - 'th', 'sv', 'gl', 'sr', 'cs', 'hi', 'hr', 'uk', 'no', 'sa', 'tr', 'ar', - 'ta', 'eo', 'sk', 'is', 'ro', 'bn', 'si', 'mk', 'bg', 'ka', 'ms', 'tt', + 'th', 'sv', 'gl', 'sr', 'cs', 'hi', 'uk', 'hr', 'no', 'sa', 'tr', 'ar', + 'ta', 'eo', 'sk', 'is', 'ro', 'bn', 'si', 'ms', 'mk', 'bg', 'ka', 'tt', 'lt', 'el', 'li', 'sl', 'tl', 'ur', 'km', 'la', 'et', 'be', 'kk', 'ia', - 'ml', 'mr', 'oc', 'ne', 'hy', 'cv', 'pa', 'tg', 'te', 'ku', 'fy', 'bs', + 'mr', 'ml', 'oc', 'ne', 'hy', 'cv', 'pa', 'tg', 'te', 'ku', 'fy', 'bs', 'cy', 'af', 'mg', 'ky', ] diff --git a/pywikibot/families/wikinews_family.py b/pywikibot/families/wikinews_family.py index 6d0c288..7527206 100644 --- a/pywikibot/families/wikinews_family.py +++ b/pywikibot/families/wikinews_family.py @@ -21,7 +21,7 @@ languages_by_size = [ 'ru', 'sr', 'fr', 'en', 'pt', 'pl', 'zh', 'de', 'es', 'it', 'ar', 'cs', - 'ca', 'nl', 'el', 'ta', 'sv', 'uk', 'fa', 'fi', 'li', 'ro', 'tr', 'ja', + 'ca', 'nl', 'el', 'ta', 'sv', 'uk', 'fa', 'li', 'fi', 'ro', 'tr', 'ja', 'eo', 'sq', 'no', 'ko', 'bg', 'bs', 'he', ] diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index d996463..167c8a1 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -31,33 +31,33 @@ 'en', 'ceb', 'sv', 'de', 'fr', 'nl', 'ru', 'it', 'es', 'pl', 'war', 'vi', 'ja', 'arz', 'zh', 'ar', 'uk', 'pt', 'fa', 'ca', 'sr', 'id', 'no', 'ko', 'fi', 'hu', 'cs', 'sh', 'zh-min-nan', 'ro', 'tr', 'eu', - 'ce', 'ms', 'eo', 'he', 'hy', 'bg', 'da', 'azb', 'tt', 'sk', 'kk', - 'hr', 'min', 'et', 'lt', 'be', 'el', 'simple', 'az', 'sl', 'gl', 'ur', + 'ms', 'ce', 'eo', 'he', 'hy', 'bg', 'da', 'tt', 'azb', 'sk', 'kk', + 'hr', 'min', 'et', 'be', 'lt', 'el', 'simple', 'az', 'sl', 'gl', 'ur', 'nn', 'ka', 'hi', 'th', 'uz', 'la', 'ta', 'cy', 'vo', 'mk', 'ast', - 'zh-yue', 'lv', 'tg', 'bn', 'my', 'af', 'mg', 'oc', 'bs', 'nds', 'sq', - 'ky', 'be-tarask', 'new', 'ml', 'te', 'br', 'mr', 'vec', 'pms', 'jv', - 'ht', 'su', 'sw', 'pnb', 'lb', 'tl', 'ba', 'ga', 'szl', 'is', 'lmo', - 'cv', 'fy', 'sco', 'wuu', 'diq', 'an', 'pa', 'ku', 'yo', 'ne', 'bar', + 'zh-yue', 'lv', 'bn', 'tg', 'my', 'af', 'mg', 'oc', 'bs', 'nds', 'sq', + 'ky', 'be-tarask', 'new', 'ml', 'te', 'mr', 'br', 'vec', 'pms', 'jv', + 'ht', 'sw', 'su', 'pnb', 'lb', 'tl', 'ba', 'ga', 'szl', 'is', 'lmo', + 'cv', 'fy', 'sco', 'wuu', 'diq', 'an', 'ku', 'pa', 'yo', 'ne', 'bar', 'io', 'gu', 'ckb', 'als', 'kn', 'scn', 'bpy', 'ia', 'qu', 'mn', - 'bat-smg', 'si', 'nv', 'or', 'cdo', 'ilo', 'gd', 'xmf', 'yi', 'am', - 'nap', 'bug', 'sd', 'wa', 'hsb', 'mai', 'fo', 'map-bms', 'mzn', 'li', - 'sah', 'os', 'eml', 'frr', 'ps', 'avk', 'sa', 'gor', 'bcl', - 'zh-classical', 'ace', 'mrj', 'mhr', 'hif', 'hak', 'roa-tara', 'pam', - 'hyw', 'crh', 'km', 'nso', 'shn', 'rue', 'as', 'se', 'bh', 'vls', 'mi', - 'nds-nl', 'zu', 'nah', 'sc', 'ha', 'vep', 'sn', 'gan', 'myv', 'ab', - 'glk', 'kab', 'bo', 'so', 'ban', 'co', 'tk', 'sat', 'fiu-vro', 'ie', - 'kv', 'csb', 'pcd', 'gv', 'udm', 'ug', 'ay', 'zea', 'nrm', 'lij', 'kw', - 'frp', 'lez', 'gn', 'lfn', 'stq', 'mwl', 'rm', 'mt', 'gom', 'lo', - 'lad', 'olo', 'koi', 'fur', 'bjn', 'ang', 'dty', 'dsb', 'ary', 'ext', - 'ln', 'tyv', 'cbk-zam', 'skr', 'dv', 'ksh', 'gag', 'pfl', 'pi', 'pag', - 'av', 'awa', 'haw', 'smn', 'bxr', 'xal', 'ig', 'krc', 'pap', 'rw', - 'za', 'pdc', 'kaa', 'szy', 'arc', 'to', 'nov', 'kbp', 'jam', 'wo', - 'tpi', 'inh', 'kbd', 'na', 'tet', 'atj', 'tcy', 'ki', 'ak', 'lld', - 'jbo', 'roa-rup', 'bi', 'lbe', 'lg', 'kg', 'ty', 'mdf', 'xh', 'fj', - 'srn', 'om', 'gcr', 'ltg', 'sm', 'chr', 'nqo', 'got', 'mnw', 'pih', - 'kl', 'st', 'ny', 'cu', 'tw', 'tn', 'ts', 'bm', 'rmy', 'chy', 'rn', - 'tum', 'mad', 'ss', 'ch', 'iu', 'ks', 'pnt', 'nia', 'ady', 've', 'ee', - 'ik', 'ff', 'sg', 'din', 'dz', 'ti', 'cr', + 'bat-smg', 'si', 'nv', 'or', 'cdo', 'ilo', 'xmf', 'gd', 'yi', 'am', + 'nap', 'bug', 'sd', 'hsb', 'wa', 'mai', 'fo', 'map-bms', 'mzn', 'li', + 'sah', 'os', 'eml', 'frr', 'avk', 'ace', 'ps', 'sa', 'gor', 'bcl', + 'zh-classical', 'mrj', 'mhr', 'hif', 'hak', 'roa-tara', 'pam', 'crh', + 'hyw', 'nso', 'km', 'shn', 'rue', 'as', 'se', 'bh', 'vls', 'zu', + 'nds-nl', 'mi', 'nah', 'sc', 'ha', 'lij', 'vep', 'sn', 'gan', 'myv', + 'ab', 'ban', 'glk', 'kab', 'bo', 'so', 'co', 'tk', 'sat', 'fiu-vro', + 'ie', 'kv', 'csb', 'pcd', 'gv', 'udm', 'ug', 'ay', 'zea', 'nrm', 'frp', + 'kw', 'lez', 'gn', 'lfn', 'stq', 'mwl', 'rm', 'mt', 'lo', 'lad', 'gom', + 'olo', 'koi', 'fur', 'bjn', 'ary', 'skr', 'ang', 'dty', 'dsb', 'ext', + 'ln', 'tyv', 'cbk-zam', 'dv', 'ksh', 'gag', 'pfl', 'pi', 'pag', 'av', + 'awa', 'smn', 'haw', 'bxr', 'xal', 'ig', 'krc', 'pap', 'rw', 'za', + 'pdc', 'kaa', 'szy', 'arc', 'to', 'nov', 'kbp', 'inh', 'jam', 'tpi', + 'wo', 'kbd', 'na', 'tet', 'ki', 'atj', 'tcy', 'ak', 'lld', 'jbo', + 'roa-rup', 'bi', 'lbe', 'lg', 'kg', 'ty', 'mdf', 'xh', 'fj', 'srn', + 'om', 'gcr', 'ltg', 'sm', 'chr', 'nqo', 'got', 'mnw', 'pih', 'kl', + 'nia', 'st', 'cu', 'ny', 'tw', 'tn', 'ts', 'bm', 'rmy', 'mad', 'chy', + 'rn', 'tum', 'ss', 'ch', 'iu', 'ks', 'pnt', 'ady', 've', 'ee', 'ik', + 'ff', 'sg', 'din', 'dz', 'ti', 'cr', ] # Sites we want to edit but not count as real languages diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 612b781..8381df9 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -28,10 +28,10 @@ languages_by_size = [ 'en', 'it', 'pl', 'ru', 'cs', 'fa', 'de', 'pt', 'fr', 'es', 'uk', 'he', - 'sk', 'tr', 'bs', 'ca', 'et', 'fi', 'az', 'sl', 'lt', 'eo', 'zh', 'bg', + 'sk', 'tr', 'bs', 'et', 'ca', 'fi', 'az', 'sl', 'lt', 'eo', 'zh', 'bg', 'ar', 'hr', 'hy', 'el', 'su', 'nn', 'id', 'sv', 'li', 'hu', 'ko', 'nl', - 'ja', 'la', 'ta', 'sah', 'sr', 'gu', 'gl', 'th', 'ur', 'te', 'be', - 'cy', 'no', 'ml', 'sq', 'kn', 'ro', 'ku', 'eu', 'uz', 'hi', 'ka', 'vi', + 'ja', 'ta', 'la', 'sah', 'sr', 'gu', 'gl', 'th', 'ur', 'te', 'be', + 'cy', 'no', 'ml', 'sq', 'kn', 'ro', 'ku', 'eu', 'uz', 'hi', 'vi', 'ka', 'da', 'sa', 'is', 'br', 'mr', 'af', 'wo', 'ky', ] diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 4877b45..e381dcb 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -26,11 +26,11 @@ languages_by_size = [ 'pl', 'en', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'ar', 'uk', 'cs', - 'gu', 'pt', 'mul', 'sr', 'fa', 'hu', 'sv', 'ml', 'ko', 'bn', 'sa', + 'gu', 'mul', 'pt', 'sr', 'fa', 'hu', 'sv', 'ml', 'ko', 'bn', 'sa', 'te', 'sl', 'ta', 'hy', 'el', 'ro', 'fi', 'ja', 'th', 'nap', 'vi', 'tr', 'az', 'ca', 'br', 'la', 'nl', 'kn', 'hr', 'eo', 'no', 'is', 'vec', 'pms', 'id', 'be', 'et', 'hi', 'da', 'lij', 'mk', 'yi', 'mr', - 'as', 'bg', 'li', 'lt', 'eu', 'or', 'wa', 'pa', 'gl', 'cy', 'bs', + 'as', 'bg', 'li', 'lt', 'eu', 'wa', 'or', 'pa', 'gl', 'cy', 'bs', 'sah', 'sk', 'zh-min-nan', 'fo', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index edea4c5..843fa17 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -27,20 +27,20 @@ ] languages_by_size = [ - 'en', 'fr', 'mg', 'ru', 'de', 'sh', 'es', 'zh', 'el', 'sv', 'nl', 'pl', + 'en', 'fr', 'mg', 'ru', 'de', 'zh', 'sh', 'es', 'el', 'sv', 'nl', 'pl', 'ku', 'lt', 'it', 'ca', 'fi', 'ta', 'hu', 'tr', 'io', 'hy', 'ko', 'kn', 'pt', 'ja', 'vi', 'sr', 'th', 'chr', 'hi', 'ro', 'no', 'id', 'et', 'ml', 'cs', 'my', 'uz', 'li', 'or', 'te', 'eo', 'fa', 'ar', 'gl', 'jv', 'oc', 'az', 'eu', 'uk', 'br', 'da', 'lo', 'ast', 'simple', 'hr', 'is', 'la', 'fj', 'tg', 'ky', 'sk', 'bg', 'wa', 'ur', 'ps', 'cy', 'vo', - 'skr', 'af', 'zh-min-nan', 'he', 'shn', 'scn', 'sl', 'tl', 'pa', 'sw', + 'skr', 'af', 'he', 'zh-min-nan', 'shn', 'scn', 'sl', 'tl', 'pa', 'sw', 'fy', 'bn', 'nn', 'lv', 'ka', 'sq', 'co', 'mn', 'pnb', 'min', 'lb', 'nds', 'bs', 'nah', 'ms', 'yue', 'sa', 'kk', 'km', 'vec', 'tk', 'diq', 'mk', 'be', 'sm', 'hsb', 'shy', 'gd', 'ga', 'an', 'wo', 'gom', 'ang', - 'ia', 'tt', 'mt', 'sd', 'gn', 'mr', 'fo', 'ie', 'so', 'csb', 'ug', - 'bcl', 'st', 'roa-rup', 'si', 'hif', 'zu', 'kl', 'mi', 'su', 'ay', - 'nia', 'jbo', 'ln', 'yi', 'gu', 'na', 'gv', 'kw', 'tpi', 'ne', 'rw', - 'ts', 'om', 'qu', 'ha', 'ss', 'iu', 'am', 'dv', 'sg', 'ti', 'tn', 'ks', + 'ia', 'tt', 'mt', 'sd', 'gn', 'fo', 'mr', 'ie', 'so', 'csb', 'ug', + 'bcl', 'st', 'roa-rup', 'si', 'nia', 'hif', 'zu', 'kl', 'mi', 'su', + 'ay', 'jbo', 'ln', 'yi', 'gu', 'na', 'gv', 'kw', 'om', 'tpi', 'ne', + 'rw', 'ts', 'qu', 'ha', 'ss', 'iu', 'am', 'dv', 'sg', 'ti', 'tn', 'ks', ] category_redirect_templates = { -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/663007 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I538e0246ba73c268929d49c59f3d15627f57753c Gerrit-Change-Number: 663007 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: [tests] cleanup appveyor_install.ps1 script

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/663002 ) Change subject: [tests] cleanup appveyor_install.ps1 script ...................................................................... [tests] cleanup appveyor_install.ps1 script - drop support for Python < 3.5 - drop support for .msi installation which is given up since 3.5 Change-Id: Id5a362a04cdd3fce8b803b70d1e9ddff28dc3a21 --- M appveyor_install.ps1 1 file changed, 16 insertions(+), 52 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/appveyor_install.ps1 b/appveyor_install.ps1 index f1519cf..8eea9af 100644 --- a/appveyor_install.ps1 +++ b/appveyor_install.ps1 @@ -2,10 +2,7 @@ # Authors: Olivier Grisel, Jonathan Helmus, Kyle Kastner, and Alex Willmer # License: CC0 1.0 Universal: https://creativecommons.org/publicdomain/zero/1.0/ -$MINICONDA_URL = "https://repo.continuum.io/miniconda/" $BASE_URL = "https://www.python.org/ftp/python/" -$GET_PIP_URL = "https://bootstrap.pypa.io/get-pip.py" -$GET_PIP_PATH = "C:\get-pip.py" $PYTHON_PRERELEASE_REGEX = @" (?x) @@ -63,35 +60,11 @@ function DownloadPython ($python_version, $platform_suffix) { $major, $minor, $micro, $prerelease = ParsePythonVersion $python_version - if (($major -le 2 -and $micro -eq 0) ` - -or ($major -eq 3 -and $minor -le 2 -and $micro -eq 0) ` - ) { - $dir = "$major.$minor" - $python_version = "$major.$minor$prerelease" - } else { - $dir = "$major.$minor.$micro" - } - - if ($prerelease) { - if (($major -le 2) ` - -or ($major -eq 3 -and $minor -eq 1) ` - -or ($major -eq 3 -and $minor -eq 2) ` - -or ($major -eq 3 -and $minor -eq 3) ` - ) { - $dir = "$dir/prev" - } - } - - if (($major -le 2) -or ($major -le 3 -and $minor -le 4)) { - $ext = "msi" - if ($platform_suffix) { - $platform_suffix = ".$platform_suffix" - } - } else { - $ext = "exe" - if ($platform_suffix) { - $platform_suffix = "-$platform_suffix" - } + # Only Python 3.5+ is supported + $dir = "$major.$minor.$micro" + $ext = "exe" + if ($platform_suffix) { + $platform_suffix = "-$platform_suffix" } $filename = "python-$python_version$platform_suffix.$ext" @@ -107,21 +80,25 @@ Write-Host $python_home "already exists, skipping." return $false } + if ($architecture -eq "32") { $platform_suffix = "" } else { $platform_suffix = "amd64" } + $installer_path = DownloadPython $python_version $platform_suffix - $installer_ext = [System.IO.Path]::GetExtension($installer_path) Write-Host "Installing $installer_path to $python_home" + + $installer_ext = [System.IO.Path]::GetExtension($installer_path) $install_log = $python_home + ".log" + if ($installer_ext -eq '.msi') { - InstallPythonMSI $installer_path $python_home $install_log + Write-Host "MSI installer is not supported" } else { - $uninstaller_path = DownloadPython 3.5.4 $platform_suffix - InstallPythonEXE $installer_path $python_home $install_log $uninstaller_path + InstallPythonEXE $installer_path $python_home $install_log } + if (Test-Path $python_home) { Write-Host "Python $python_version ($architecture) installation complete" } else { @@ -132,25 +109,12 @@ } -function InstallPythonEXE ($exepath, $python_home, $install_log, $unexepath) { - $uninstall_args = "/log C:\Python35-x64.log /quiet /uninstall InstallAllUsers=1 TargetDir=C:\Python35-x64\" - RunCommand $unexepath $uninstall_args +function InstallPythonEXE ($exepath, $python_home, $install_log) { $install_args = "/log $install_log /quiet InstallAllUsers=1 TargetDir=$python_home\" RunCommand $exepath $install_args } -function InstallPythonMSI ($msipath, $python_home, $install_log) { - $install_args = "/qn /log $install_log /i $msipath TARGETDIR=$python_home" - $uninstall_args = "/qn /x $msipath" - RunCommand "msiexec.exe" $install_args - if (-not(Test-Path $python_home)) { - Write-Host "Python seems to be installed else-where, reinstalling." - RunCommand "msiexec.exe" $uninstall_args - RunCommand "msiexec.exe" $install_args - } -} - function RunCommand ($command, $command_args) { Write-Host $command $command_args Start-Process -FilePath $command -ArgumentList $command_args -Wait -Passthru @@ -158,8 +122,8 @@ function main () { - if ($env:PYTHON_VERSION -eq "3.5.0") { - InstallPython $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON + if ($env:PYTHON_VERSION -eq "3.5.0") { + InstallPython $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON } } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/663002 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Id5a362a04cdd3fce8b803b70d1e9ddff28dc3a21 Gerrit-Change-Number: 663002 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: [tests] Upgrade pip at appveyor built

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662994 ) Change subject: [tests] Upgrade pip at appveyor built ...................................................................... [tests] Upgrade pip at appveyor built Change-Id: Ie9f7bc6b6f2afc9c62cd1d65341d84020bd3e418 --- M .appveyor.yml 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.appveyor.yml b/.appveyor.yml index 901d0be..800b75e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -76,9 +76,11 @@ # Download Python version which isn't pre-installed - ps: ./appveyor_install.ps1 - python -m venv env + - python --version - env\Scripts\activate.bat - - pip install -r dev-requirements.txt + - pip install --upgrade pip - pip install -r requirements.txt + - pip install -r dev-requirements.txt build: off -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662994 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ie9f7bc6b6f2afc9c62cd1d65341d84020bd3e418 Gerrit-Change-Number: 662994 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: [tests] Fix shell script

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662993 ) Change subject: [tests] Fix shell script ...................................................................... [tests] Fix shell script Change-Id: I552c055787c64b438bc85ff7821dc199899b730e --- M appveyor_install.ps1 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/appveyor_install.ps1 b/appveyor_install.ps1 index 785edfe..f1519cf 100644 --- a/appveyor_install.ps1 +++ b/appveyor_install.ps1 @@ -158,7 +158,7 @@ function main () { - if ($env:PYTHON_VERSION=="3.5.0") { + if ($env:PYTHON_VERSION -eq "3.5.0") { InstallPython $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON } } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662993 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I552c055787c64b438bc85ff7821dc199899b730e Gerrit-Change-Number: 662993 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: [tests] Fix shell script

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662989 ) Change subject: [tests] Fix shell script ...................................................................... [tests] Fix shell script Change-Id: I7ae352761c7863ba5ad02080b806a2e4b337ce2c --- M appveyor_install.ps1 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/appveyor_install.ps1 b/appveyor_install.ps1 index 6d5d20a..785edfe 100644 --- a/appveyor_install.ps1 +++ b/appveyor_install.ps1 @@ -158,7 +158,7 @@ function main () { - if $env:PYTHON_VERSION=="3.5.0" { + if ($env:PYTHON_VERSION=="3.5.0") { InstallPython $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON } } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662989 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I7ae352761c7863ba5ad02080b806a2e4b337ce2c Gerrit-Change-Number: 662989 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: [tests] Fix shell path

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662987 ) Change subject: [tests] Fix shell path ...................................................................... [tests] Fix shell path Change-Id: Ia373f801541f47a520217b19ddb199b858a0df34 --- M .appveyor.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.appveyor.yml b/.appveyor.yml index b0cc5e8..901d0be 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -74,7 +74,7 @@ # Download the Appveyor Python build accessories into subdirectory .\appveyor - mkdir appveyor # Download Python version which isn't pre-installed - - ps: appveyor_install.ps1 + - ps: ./appveyor_install.ps1 - python -m venv env - env\Scripts\activate.bat - pip install -r dev-requirements.txt -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662987 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ia373f801541f47a520217b19ddb199b858a0df34 Gerrit-Change-Number: 662987 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: [tests] Enable installing Python 3.5.0

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662977 ) Change subject: [tests] Enable installing Python 3.5.0 ...................................................................... [tests] Enable installing Python 3.5.0 Bug: T273367 Change-Id: I52d039e8a0beaedf79528aba2052e19d7b97021a --- M .appveyor.yml A appveyor_install.ps1 2 files changed, 168 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index 31342b8..b0cc5e8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -73,8 +73,8 @@ - git submodule update --init # Download the Appveyor Python build accessories into subdirectory .\appveyor - mkdir appveyor - - ps: $wc = new-object net.webclient - + # Download Python version which isn't pre-installed + - ps: appveyor_install.ps1 - python -m venv env - env\Scripts\activate.bat - pip install -r dev-requirements.txt diff --git a/appveyor_install.ps1 b/appveyor_install.ps1 new file mode 100644 index 0000000..6d5d20a --- /dev/null +++ b/appveyor_install.ps1 @@ -0,0 +1,166 @@ +# Sample script to install Python and pip under Windows +# Authors: Olivier Grisel, Jonathan Helmus, Kyle Kastner, and Alex Willmer +# License: CC0 1.0 Universal: https://creativecommons.org/publicdomain/zero/1.0/ + +$MINICONDA_URL = "https://repo.continuum.io/miniconda/" +$BASE_URL = "https://www.python.org/ftp/python/" +$GET_PIP_URL = "https://bootstrap.pypa.io/get-pip.py" +$GET_PIP_PATH = "C:\get-pip.py" + +$PYTHON_PRERELEASE_REGEX = @" +(?x) +(?<major>\d+) +\. +(?<minor>\d+) +\. +(?<micro>\d+) +(?<prerelease>[a-z]{1,2}\d+) +"@ + + +function Download ($filename, $url) { + $webclient = New-Object System.Net.WebClient + + $basedir = $pwd.Path + "\" + $filepath = $basedir + $filename + if (Test-Path $filename) { + Write-Host "Reusing" $filepath + return $filepath + } + + # Download and retry up to 3 times in case of network transient errors. + Write-Host "Downloading" $filename "from" $url + $retry_attempts = 2 + for ($i = 0; $i -lt $retry_attempts; $i++) { + try { + $webclient.DownloadFile($url, $filepath) + break + } + Catch [Exception]{ + Start-Sleep 1 + } + } + if (Test-Path $filepath) { + Write-Host "File saved at" $filepath + } else { + # Retry once to get the error message if any at the last try + $webclient.DownloadFile($url, $filepath) + } + return $filepath +} + + +function ParsePythonVersion ($python_version) { + if ($python_version -match $PYTHON_PRERELEASE_REGEX) { + return ([int]$matches.major, [int]$matches.minor, [int]$matches.micro, + $matches.prerelease) + } + $version_obj = [version]$python_version + return ($version_obj.major, $version_obj.minor, $version_obj.build, "") +} + + +function DownloadPython ($python_version, $platform_suffix) { + $major, $minor, $micro, $prerelease = ParsePythonVersion $python_version + + if (($major -le 2 -and $micro -eq 0) ` + -or ($major -eq 3 -and $minor -le 2 -and $micro -eq 0) ` + ) { + $dir = "$major.$minor" + $python_version = "$major.$minor$prerelease" + } else { + $dir = "$major.$minor.$micro" + } + + if ($prerelease) { + if (($major -le 2) ` + -or ($major -eq 3 -and $minor -eq 1) ` + -or ($major -eq 3 -and $minor -eq 2) ` + -or ($major -eq 3 -and $minor -eq 3) ` + ) { + $dir = "$dir/prev" + } + } + + if (($major -le 2) -or ($major -le 3 -and $minor -le 4)) { + $ext = "msi" + if ($platform_suffix) { + $platform_suffix = ".$platform_suffix" + } + } else { + $ext = "exe" + if ($platform_suffix) { + $platform_suffix = "-$platform_suffix" + } + } + + $filename = "python-$python_version$platform_suffix.$ext" + $url = "$BASE_URL$dir/$filename" + $filepath = Download $filename $url + return $filepath +} + + +function InstallPython ($python_version, $architecture, $python_home) { + Write-Host "Installing Python" $python_version "for" $architecture "bit architecture to" $python_home + if (Test-Path $python_home) { + Write-Host $python_home "already exists, skipping." + return $false + } + if ($architecture -eq "32") { + $platform_suffix = "" + } else { + $platform_suffix = "amd64" + } + $installer_path = DownloadPython $python_version $platform_suffix + $installer_ext = [System.IO.Path]::GetExtension($installer_path) + Write-Host "Installing $installer_path to $python_home" + $install_log = $python_home + ".log" + if ($installer_ext -eq '.msi') { + InstallPythonMSI $installer_path $python_home $install_log + } else { + $uninstaller_path = DownloadPython 3.5.4 $platform_suffix + InstallPythonEXE $installer_path $python_home $install_log $uninstaller_path + } + if (Test-Path $python_home) { + Write-Host "Python $python_version ($architecture) installation complete" + } else { + Write-Host "Failed to install Python in $python_home" + Get-Content -Path $install_log + Exit 1 + } +} + + +function InstallPythonEXE ($exepath, $python_home, $install_log, $unexepath) { + $uninstall_args = "/log C:\Python35-x64.log /quiet /uninstall InstallAllUsers=1 TargetDir=C:\Python35-x64\" + RunCommand $unexepath $uninstall_args + $install_args = "/log $install_log /quiet InstallAllUsers=1 TargetDir=$python_home\" + RunCommand $exepath $install_args +} + + +function InstallPythonMSI ($msipath, $python_home, $install_log) { + $install_args = "/qn /log $install_log /i $msipath TARGETDIR=$python_home" + $uninstall_args = "/qn /x $msipath" + RunCommand "msiexec.exe" $install_args + if (-not(Test-Path $python_home)) { + Write-Host "Python seems to be installed else-where, reinstalling." + RunCommand "msiexec.exe" $uninstall_args + RunCommand "msiexec.exe" $install_args + } +} + +function RunCommand ($command, $command_args) { + Write-Host $command $command_args + Start-Process -FilePath $command -ArgumentList $command_args -Wait -Passthru +} + + +function main () { + if $env:PYTHON_VERSION=="3.5.0" { + InstallPython $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON + } +} + +main -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662977 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I52d039e8a0beaedf79528aba2052e19d7b97021a Gerrit-Change-Number: 662977 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: [tests] use an empty requirements.txt if PYSETUP_TEST_EXTRAS != 1

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662940 ) Change subject: [tests] use an empty requirements.txt if PYSETUP_TEST_EXTRAS != 1 ...................................................................... [tests] use an empty requirements.txt if PYSETUP_TEST_EXTRAS != 1 Change-Id: I83a0afb9d7bd194e2d23f3e90a77d23af2587a67 --- M .travis.yml 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index 61b2dc5..9d6aa1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,9 @@ # default 'install' step to install all dependencies listed in # requirements.txt to verify that a minimal install works as expected. # Instead install requests in the before_script step below. - - if [[ "$PYSETUP_TEST_EXTRAS" != '1' ]]; then rm requirements.txt ; fi + - if [[ "$PYSETUP_TEST_EXTRAS" != '1' ]]; then + printf "# Empty requirements with PYSETUP_TEST_EXTRA" > requirements.txt ; + fi # When the env variable USE_NOSE or USE_PYTEST is set, the appropriate # tool is used, else PYTEST is taken as the default -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662940 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I83a0afb9d7bd194e2d23f3e90a77d23af2587a67 Gerrit-Change-Number: 662940 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 3 months

← Newer
1
...
7
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits February 2021