From 459ec8f320d37439056f9b721fba2c6632e12aa7 Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Mon, 6 Dec 2021 12:06:31 -0700 Subject: [PATCH 1/7] add scriptworker-client dep for pushmsixscript coveralls --- pushmsixscript/tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/pushmsixscript/tox.ini b/pushmsixscript/tox.ini index 9f256d97a..a2f94c8d7 100644 --- a/pushmsixscript/tox.ini +++ b/pushmsixscript/tox.ini @@ -49,6 +49,7 @@ commands = deps= python-coveralls coverage + -e {toxinidir}/../scriptworker_client commands= coveralls From fff1caf29303592eea9f4150789bfd2c05a4f118 Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Mon, 6 Dec 2021 13:08:47 -0700 Subject: [PATCH 2/7] fix the same issue in githubscript --- githubscript/tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/githubscript/tox.ini b/githubscript/tox.ini index 0979d1ce0..a72601480 100644 --- a/githubscript/tox.ini +++ b/githubscript/tox.ini @@ -49,6 +49,7 @@ commands = deps= python-coveralls coverage + -e {toxinidir}/../scriptworker_client commands= coveralls From 85b2498bfabb954441340001fcb2b6fc04a36c23 Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Mon, 6 Dec 2021 14:25:10 -0700 Subject: [PATCH 3/7] switch to coveralls-python --- githubscript/tox.ini | 2 +- pushmsixscript/tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/githubscript/tox.ini b/githubscript/tox.ini index a72601480..92e185957 100644 --- a/githubscript/tox.ini +++ b/githubscript/tox.ini @@ -47,7 +47,7 @@ commands = [testenv:coveralls] deps= - python-coveralls + coveralls-python coverage -e {toxinidir}/../scriptworker_client commands= diff --git a/pushmsixscript/tox.ini b/pushmsixscript/tox.ini index a2f94c8d7..b517aece3 100644 --- a/pushmsixscript/tox.ini +++ b/pushmsixscript/tox.ini @@ -47,7 +47,7 @@ commands = [testenv:coveralls] deps= - python-coveralls + coveralls-python coverage -e {toxinidir}/../scriptworker_client commands= From 5b2457c7b944a666073b17c8472784004860a421 Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Mon, 6 Dec 2021 15:59:27 -0700 Subject: [PATCH 4/7] try "coveralls" instead --- githubscript/tox.ini | 2 +- pushmsixscript/tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/githubscript/tox.ini b/githubscript/tox.ini index 92e185957..d4b1efced 100644 --- a/githubscript/tox.ini +++ b/githubscript/tox.ini @@ -47,7 +47,7 @@ commands = [testenv:coveralls] deps= - coveralls-python + coveralls coverage -e {toxinidir}/../scriptworker_client commands= diff --git a/pushmsixscript/tox.ini b/pushmsixscript/tox.ini index b517aece3..3f8df378b 100644 --- a/pushmsixscript/tox.ini +++ b/pushmsixscript/tox.ini @@ -47,7 +47,7 @@ commands = [testenv:coveralls] deps= - coveralls-python + coveralls coverage -e {toxinidir}/../scriptworker_client commands= From 7509863e57be92ea5a9052492f5863c10415a06c Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Mon, 6 Dec 2021 16:40:25 -0700 Subject: [PATCH 5/7] apply coveralls changes to more scripts --- balrogscript/tox.ini | 3 ++- treescript/tox.ini | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/balrogscript/tox.ini b/balrogscript/tox.ini index 50acb383d..3a39d9d5a 100644 --- a/balrogscript/tox.ini +++ b/balrogscript/tox.ini @@ -48,8 +48,9 @@ commands = [testenv:coveralls] deps= - python-coveralls + coveralls coverage + -e {toxinidir}/../scriptworker_client commands= coveralls diff --git a/treescript/tox.ini b/treescript/tox.ini index 1cd8e21df..0ac9f9ace 100644 --- a/treescript/tox.ini +++ b/treescript/tox.ini @@ -50,8 +50,9 @@ commands = [testenv:coveralls] deps= - python-coveralls - coverage>=4.2b1 + coveralls + coverage + -e {toxinidir}/../scriptworker_client commands= coveralls From 32eeb33b5e90dd85ed3332cada59f46ceb99c173 Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Mon, 6 Dec 2021 17:13:35 -0700 Subject: [PATCH 6/7] remove all references to unmaintained python-coveralls; stop hiding coveralls failures --- beetmoverscript/tox.ini | 2 +- bouncerscript/tox.ini | 2 +- pushapkscript/tox.ini | 2 +- pushflatpakscript/tox.ini | 2 +- scriptworker_client/tox.ini | 2 +- shipitscript/tox.ini | 2 +- signingscript/tox.ini | 2 +- tox.ini | 28 ++++++++++++++-------------- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/beetmoverscript/tox.ini b/beetmoverscript/tox.ini index d7e22b325..3783b5a8c 100644 --- a/beetmoverscript/tox.ini +++ b/beetmoverscript/tox.ini @@ -49,7 +49,7 @@ commands = [testenv:coveralls] deps = - python-coveralls + coveralls coverage>=4.2 commands = coveralls diff --git a/bouncerscript/tox.ini b/bouncerscript/tox.ini index 9b351cafc..468f793ed 100644 --- a/bouncerscript/tox.ini +++ b/bouncerscript/tox.ini @@ -50,7 +50,7 @@ commands = [testenv:coveralls] deps= - python-coveralls + coveralls coverage>=4.2 commands= coveralls diff --git a/pushapkscript/tox.ini b/pushapkscript/tox.ini index 94ca6e886..3ea7ea5e4 100644 --- a/pushapkscript/tox.ini +++ b/pushapkscript/tox.ini @@ -48,7 +48,7 @@ commands = [testenv:coveralls] deps= - python-coveralls + coveralls coverage commands= coveralls diff --git a/pushflatpakscript/tox.ini b/pushflatpakscript/tox.ini index 56d817b89..cebe401b9 100644 --- a/pushflatpakscript/tox.ini +++ b/pushflatpakscript/tox.ini @@ -49,7 +49,7 @@ commands = [testenv:coveralls] deps= - python-coveralls + coveralls coverage commands= coveralls diff --git a/scriptworker_client/tox.ini b/scriptworker_client/tox.ini index e859793d2..f14cf630e 100644 --- a/scriptworker_client/tox.ini +++ b/scriptworker_client/tox.ini @@ -24,7 +24,7 @@ commands= [testenv:coveralls] deps = - python-coveralls + coveralls coverage whitelist_externals = diff --git a/shipitscript/tox.ini b/shipitscript/tox.ini index 64da13ea3..196b3b99b 100644 --- a/shipitscript/tox.ini +++ b/shipitscript/tox.ini @@ -49,7 +49,7 @@ commands = [testenv:coveralls] deps = - python-coveralls + coveralls coverage>=4.2 commands = coveralls diff --git a/signingscript/tox.ini b/signingscript/tox.ini index 0883c967a..38e9b4d73 100644 --- a/signingscript/tox.ini +++ b/signingscript/tox.ini @@ -52,7 +52,7 @@ commands = [testenv:coveralls] deps= - python-coveralls + coveralls coverage commands= coveralls diff --git a/tox.ini b/tox.ini index c33489e11..ebf442640 100644 --- a/tox.ini +++ b/tox.ini @@ -53,7 +53,7 @@ commands = changedir = {toxinidir}/addonscript commands = tox -e py39,check - - tox -e coveralls + tox -e coveralls [testenv:balrogscript-py38] changedir = {toxinidir}/balrogscript @@ -64,7 +64,7 @@ commands = changedir = {toxinidir}/balrogscript commands = tox -e py39,check - - tox -e coveralls + tox -e coveralls [testenv:beetmoverscript-py38] changedir = {toxinidir}/beetmoverscript @@ -75,7 +75,7 @@ commands = changedir = {toxinidir}/beetmoverscript commands = tox -e py39,check - - tox -e coveralls + tox -e coveralls [testenv:bouncerscript-py38] changedir = {toxinidir}/bouncerscript @@ -86,7 +86,7 @@ commands = changedir = {toxinidir}/bouncerscript commands = tox -e py39,check - - tox -e coveralls + tox -e coveralls [testenv:configloader-py38] changedir = {toxinidir}/configloader @@ -97,13 +97,13 @@ commands = changedir = {toxinidir}/configloader commands = tox -e py39,check - - tox -e coveralls + tox -e coveralls [testenv:iscript-py38] changedir = {toxinidir}/iscript commands = tox -e py38,check - - tox -e coveralls + tox -e coveralls #[testenv:iscript-py39] #changedir = {toxinidir}/iscript @@ -120,13 +120,13 @@ commands = changedir = {toxinidir}/githubscript commands = tox -e py39 - - tox -e coveralls + tox -e coveralls [testenv:notarization_poller-py38] changedir = {toxinidir}/notarization_poller commands = tox -e py38 - - tox -e coveralls + tox -e coveralls [testenv:notarization_poller-py39] changedir = {toxinidir}/notarization_poller @@ -142,7 +142,7 @@ commands = changedir = {toxinidir}/pushapkscript commands = tox -e py39,check - - tox -e coveralls + tox -e coveralls [testenv:pushflatpakscript-py38] changedir = {toxinidir}/pushflatpakscript @@ -153,7 +153,7 @@ commands = changedir = {toxinidir}/pushflatpakscript commands = tox -e py39,check - - tox -e coveralls + tox -e coveralls [testenv:pushmsixscript-py38] changedir = {toxinidir}/pushmsixscript @@ -164,7 +164,7 @@ commands = changedir = {toxinidir}/pushmsixscript commands = tox -e py39,check - - tox -e coveralls + tox -e coveralls [testenv:scriptworker_client-py38] changedir = {toxinidir}/scriptworker_client @@ -175,7 +175,7 @@ commands = changedir = {toxinidir}/scriptworker_client commands = tox -e py39,mypy - - tox -e coveralls + tox -e coveralls [testenv:shipitscript-py38] changedir = {toxinidir}/shipitscript @@ -196,7 +196,7 @@ commands = changedir = {toxinidir}/signingscript commands = tox -e py39,check - - tox -e coveralls + tox -e coveralls [testenv:treescript-py38] changedir = {toxinidir}/treescript @@ -207,4 +207,4 @@ commands = changedir = {toxinidir}/treescript commands = tox -e py39,check - - tox -e coveralls + tox -e coveralls From 6bf00ffa7d4625bdedca3e675d2cf576727b12a3 Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Tue, 7 Dec 2021 14:08:30 -0700 Subject: [PATCH 7/7] cleanup --- tox.ini | 28 ++++++++++++++-------------- treescript/tox.ini | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tox.ini b/tox.ini index ebf442640..c33489e11 100644 --- a/tox.ini +++ b/tox.ini @@ -53,7 +53,7 @@ commands = changedir = {toxinidir}/addonscript commands = tox -e py39,check - tox -e coveralls + - tox -e coveralls [testenv:balrogscript-py38] changedir = {toxinidir}/balrogscript @@ -64,7 +64,7 @@ commands = changedir = {toxinidir}/balrogscript commands = tox -e py39,check - tox -e coveralls + - tox -e coveralls [testenv:beetmoverscript-py38] changedir = {toxinidir}/beetmoverscript @@ -75,7 +75,7 @@ commands = changedir = {toxinidir}/beetmoverscript commands = tox -e py39,check - tox -e coveralls + - tox -e coveralls [testenv:bouncerscript-py38] changedir = {toxinidir}/bouncerscript @@ -86,7 +86,7 @@ commands = changedir = {toxinidir}/bouncerscript commands = tox -e py39,check - tox -e coveralls + - tox -e coveralls [testenv:configloader-py38] changedir = {toxinidir}/configloader @@ -97,13 +97,13 @@ commands = changedir = {toxinidir}/configloader commands = tox -e py39,check - tox -e coveralls + - tox -e coveralls [testenv:iscript-py38] changedir = {toxinidir}/iscript commands = tox -e py38,check - tox -e coveralls + - tox -e coveralls #[testenv:iscript-py39] #changedir = {toxinidir}/iscript @@ -120,13 +120,13 @@ commands = changedir = {toxinidir}/githubscript commands = tox -e py39 - tox -e coveralls + - tox -e coveralls [testenv:notarization_poller-py38] changedir = {toxinidir}/notarization_poller commands = tox -e py38 - tox -e coveralls + - tox -e coveralls [testenv:notarization_poller-py39] changedir = {toxinidir}/notarization_poller @@ -142,7 +142,7 @@ commands = changedir = {toxinidir}/pushapkscript commands = tox -e py39,check - tox -e coveralls + - tox -e coveralls [testenv:pushflatpakscript-py38] changedir = {toxinidir}/pushflatpakscript @@ -153,7 +153,7 @@ commands = changedir = {toxinidir}/pushflatpakscript commands = tox -e py39,check - tox -e coveralls + - tox -e coveralls [testenv:pushmsixscript-py38] changedir = {toxinidir}/pushmsixscript @@ -164,7 +164,7 @@ commands = changedir = {toxinidir}/pushmsixscript commands = tox -e py39,check - tox -e coveralls + - tox -e coveralls [testenv:scriptworker_client-py38] changedir = {toxinidir}/scriptworker_client @@ -175,7 +175,7 @@ commands = changedir = {toxinidir}/scriptworker_client commands = tox -e py39,mypy - tox -e coveralls + - tox -e coveralls [testenv:shipitscript-py38] changedir = {toxinidir}/shipitscript @@ -196,7 +196,7 @@ commands = changedir = {toxinidir}/signingscript commands = tox -e py39,check - tox -e coveralls + - tox -e coveralls [testenv:treescript-py38] changedir = {toxinidir}/treescript @@ -207,4 +207,4 @@ commands = changedir = {toxinidir}/treescript commands = tox -e py39,check - tox -e coveralls + - tox -e coveralls diff --git a/treescript/tox.ini b/treescript/tox.ini index 0ac9f9ace..f3ebcae6f 100644 --- a/treescript/tox.ini +++ b/treescript/tox.ini @@ -51,7 +51,7 @@ commands = [testenv:coveralls] deps= coveralls - coverage + coverage>=4.2b1 -e {toxinidir}/../scriptworker_client commands= coveralls