From 7ed2a5f04669ef3851b46bc683c7981a977150b7 Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Wed, 12 Apr 2023 17:07:34 +0200 Subject: [PATCH 1/4] rm codecov --- packages/pytest-simcore/requirements/coverage.txt | 1 - services/agent/requirements/_test.in | 2 +- services/api-server/requirements/_test.in | 2 +- services/autoscaling/requirements/_test.in | 2 +- services/catalog/requirements/_test.in | 2 +- services/datcore-adapter/requirements/_test.in | 2 +- services/director-v2/requirements/_test.in | 2 +- services/director/requirements/_test.in | 2 +- services/invitations/requirements/_test.in | 2 +- .../osparc-gateway-server/tests/system/requirements/_test.in | 2 +- services/storage/requirements/_test.in | 2 +- services/web/server/requirements/_test.in | 2 +- 12 files changed, 11 insertions(+), 12 deletions(-) diff --git a/packages/pytest-simcore/requirements/coverage.txt b/packages/pytest-simcore/requirements/coverage.txt index 5d48901d416..9ce25a3dad9 100644 --- a/packages/pytest-simcore/requirements/coverage.txt +++ b/packages/pytest-simcore/requirements/coverage.txt @@ -4,4 +4,3 @@ pytest-cov coveralls coverage -codecov diff --git a/services/agent/requirements/_test.in b/services/agent/requirements/_test.in index 56d67fdfbcc..7a32b04eaab 100644 --- a/services/agent/requirements/_test.in +++ b/services/agent/requirements/_test.in @@ -11,7 +11,7 @@ --constraint _base.txt aioboto3 -codecov + coverage coveralls faker diff --git a/services/api-server/requirements/_test.in b/services/api-server/requirements/_test.in index f413eb9ea8a..45ce699bdd5 100644 --- a/services/api-server/requirements/_test.in +++ b/services/api-server/requirements/_test.in @@ -13,7 +13,7 @@ alembic asgi_lifespan click -codecov + coveralls docker faker diff --git a/services/autoscaling/requirements/_test.in b/services/autoscaling/requirements/_test.in index 25c2f8ed776..4ea25f32c2d 100644 --- a/services/autoscaling/requirements/_test.in +++ b/services/autoscaling/requirements/_test.in @@ -12,7 +12,7 @@ asgi-lifespan -codecov + coverage coveralls deepdiff diff --git a/services/catalog/requirements/_test.in b/services/catalog/requirements/_test.in index c3135b8e9d7..ce6d13f756a 100644 --- a/services/catalog/requirements/_test.in +++ b/services/catalog/requirements/_test.in @@ -13,7 +13,7 @@ alembic # migration due to pytest_simcore.postgres_service click -codecov + coveralls docker Faker diff --git a/services/datcore-adapter/requirements/_test.in b/services/datcore-adapter/requirements/_test.in index c8548cff045..5aca15fdca6 100644 --- a/services/datcore-adapter/requirements/_test.in +++ b/services/datcore-adapter/requirements/_test.in @@ -6,7 +6,7 @@ asgi_lifespan -codecov + coverage coveralls faker diff --git a/services/director-v2/requirements/_test.in b/services/director-v2/requirements/_test.in index 17d1c1b56b4..d9bb4a4d4cd 100644 --- a/services/director-v2/requirements/_test.in +++ b/services/director-v2/requirements/_test.in @@ -14,7 +14,7 @@ aioboto3 alembic # migration due to pytest_simcore.postgres_service2 asgi_lifespan async-asgi-testclient # replacement for fastapi.testclient.TestClient [see b) below] -codecov + coveralls dask-gateway-server[local] dask[distributed,diagnostics] diff --git a/services/director/requirements/_test.in b/services/director/requirements/_test.in index ead790f296c..d0b230ce166 100644 --- a/services/director/requirements/_test.in +++ b/services/director/requirements/_test.in @@ -16,7 +16,7 @@ pytest-simcore @ git+https://github.com/ITISFoundation/osparc-simcore.git@79f86 # testing aioresponses -codecov + coverage==4.5.1 # TODO: Downgraded because of a bug https://github.com/nedbat/coveragepy/issues/716 coveralls docker diff --git a/services/invitations/requirements/_test.in b/services/invitations/requirements/_test.in index 06247025522..fba879b85b9 100644 --- a/services/invitations/requirements/_test.in +++ b/services/invitations/requirements/_test.in @@ -10,7 +10,7 @@ # --constraint _base.txt -codecov + coverage coveralls faker diff --git a/services/osparc-gateway-server/tests/system/requirements/_test.in b/services/osparc-gateway-server/tests/system/requirements/_test.in index bafd14bb4ac..71a1c3c0ed8 100644 --- a/services/osparc-gateway-server/tests/system/requirements/_test.in +++ b/services/osparc-gateway-server/tests/system/requirements/_test.in @@ -4,7 +4,7 @@ aiodocker -codecov + dask-gateway docker faker diff --git a/services/storage/requirements/_test.in b/services/storage/requirements/_test.in index c3efeec0133..76f3a3cea79 100644 --- a/services/storage/requirements/_test.in +++ b/services/storage/requirements/_test.in @@ -9,7 +9,7 @@ simcore-service-storage-sdk @ git+https://github.com/ITISFoundation/osparc-simcore.git@cfdf4f86d844ebb362f4f39e9c6571d561b72897#subdirectory=services/storage/client-sdk/python aioresponses -codecov + coverage coveralls docker diff --git a/services/web/server/requirements/_test.in b/services/web/server/requirements/_test.in index ef614e5e634..018dd88996c 100644 --- a/services/web/server/requirements/_test.in +++ b/services/web/server/requirements/_test.in @@ -11,7 +11,7 @@ aioresponses alembic click -codecov + coverage coveralls docker From 2685834334ec7feb52b43f4c7ecc7324dfa9cd5b Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Wed, 12 Apr 2023 17:07:48 +0200 Subject: [PATCH 2/4] cleanup --- .github/workflows/ci-testing-deploy.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci-testing-deploy.yml b/.github/workflows/ci-testing-deploy.yml index cc4ab0cb4b6..e245ca5dc49 100644 --- a/.github/workflows/ci-testing-deploy.yml +++ b/.github/workflows/ci-testing-deploy.yml @@ -978,10 +978,6 @@ jobs: run: ./ci/github/unit-testing/frontend.bash install - name: test run: ./ci/github/unit-testing/frontend.bash test - # no coverage here?? - # - uses: codecov/codecov-action@v3.1.1 - # with: - # flags: unittests #optional unit-test-python-linting: needs: changes From 206fce69f5f9d4e12da77fa8d49073d1da134c7c Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Wed, 12 Apr 2023 17:15:49 +0200 Subject: [PATCH 3/4] rm codecov --- services/agent/requirements/_test.txt | 4 ---- services/api-server/requirements/_test.txt | 4 ---- services/autoscaling/requirements/_test.txt | 4 ---- services/catalog/requirements/_test.txt | 4 ---- services/datcore-adapter/requirements/_test.txt | 7 +------ services/director-v2/requirements/_test.txt | 4 ---- services/invitations/requirements/_test.txt | 7 +------ .../tests/system/requirements/_test.txt | 10 ++-------- services/storage/requirements/_test.txt | 4 ---- services/web/server/requirements/_test.txt | 4 ---- 10 files changed, 4 insertions(+), 48 deletions(-) diff --git a/services/agent/requirements/_test.txt b/services/agent/requirements/_test.txt index 51b8a9e8a80..9ad3eaf6102 100644 --- a/services/agent/requirements/_test.txt +++ b/services/agent/requirements/_test.txt @@ -62,12 +62,9 @@ click==8.1.3 # via # -c requirements/_base.txt # flask -codecov==2.1.12 - # via -r requirements/_test.in coverage==6.5.0 # via # -r requirements/_test.in - # codecov # coveralls # pytest-cov coveralls==3.3.1 @@ -216,7 +213,6 @@ pyyaml==5.4.1 # openapi-spec-validator requests==2.28.2 # via - # codecov # coveralls # docker # moto diff --git a/services/api-server/requirements/_test.txt b/services/api-server/requirements/_test.txt index 6a11e4c58a0..feb193a7d78 100644 --- a/services/api-server/requirements/_test.txt +++ b/services/api-server/requirements/_test.txt @@ -62,11 +62,8 @@ click==8.1.3 # via # -r requirements/_test.in # flask -codecov==2.1.12 - # via -r requirements/_test.in coverage==6.5.0 # via - # codecov # coveralls # pytest-cov coveralls==3.3.1 @@ -245,7 +242,6 @@ pyyaml==5.4.1 requests==2.27.1 # via # -c requirements/_base.txt - # codecov # coveralls # docker # moto diff --git a/services/autoscaling/requirements/_test.txt b/services/autoscaling/requirements/_test.txt index 8ddcff306c6..5b557f269a9 100644 --- a/services/autoscaling/requirements/_test.txt +++ b/services/autoscaling/requirements/_test.txt @@ -55,12 +55,9 @@ click==8.1.3 # via # -c requirements/_base.txt # flask -codecov==2.1.12 - # via -r requirements/_test.in coverage==6.5.0 # via # -r requirements/_test.in - # codecov # coveralls # pytest-cov coveralls==3.3.1 @@ -228,7 +225,6 @@ redis==4.5.1 # fakeredis requests==2.28.2 # via - # codecov # coveralls # docker # moto diff --git a/services/catalog/requirements/_test.txt b/services/catalog/requirements/_test.txt index 9cfd7b614e4..0ae5910b79e 100644 --- a/services/catalog/requirements/_test.txt +++ b/services/catalog/requirements/_test.txt @@ -40,11 +40,8 @@ charset-normalizer==2.0.12 # requests click==8.1.3 # via -r requirements/_test.in -codecov==2.1.12 - # via -r requirements/_test.in coverage==6.5.0 # via - # codecov # coveralls # pytest-cov coveralls==3.3.1 @@ -154,7 +151,6 @@ python-dateutil==2.8.2 requests==2.27.1 # via # -c requirements/_base.txt - # codecov # coveralls # docker respx==0.20.1 diff --git a/services/datcore-adapter/requirements/_test.txt b/services/datcore-adapter/requirements/_test.txt index b014747aed5..b91b1f7ee29 100644 --- a/services/datcore-adapter/requirements/_test.txt +++ b/services/datcore-adapter/requirements/_test.txt @@ -22,12 +22,9 @@ certifi==2022.12.7 # requests charset-normalizer==3.0.1 # via requests -codecov==2.1.12 - # via -r requirements/_test.in coverage==6.5.0 # via # -r requirements/_test.in - # codecov # coveralls # pytest-cov coveralls==3.3.1 @@ -101,9 +98,7 @@ python-dateutil==2.8.2 # -c requirements/_base.txt # faker requests==2.28.2 - # via - # codecov - # coveralls + # via coveralls respx==0.20.1 # via -r requirements/_test.in rfc3986==1.5.0 diff --git a/services/director-v2/requirements/_test.txt b/services/director-v2/requirements/_test.txt index dc5410e0444..eebf7bf231a 100644 --- a/services/director-v2/requirements/_test.txt +++ b/services/director-v2/requirements/_test.txt @@ -81,13 +81,10 @@ cloudpickle==2.2.1 # -c requirements/_base.txt # dask # distributed -codecov==2.1.12 - # via -r requirements/_test.in colorlog==6.7.0 # via dask-gateway-server coverage==6.5.0 # via - # codecov # coveralls # pytest-cov coveralls==3.3.1 @@ -281,7 +278,6 @@ requests==2.27.1 # via # -c requirements/_base.txt # async-asgi-testclient - # codecov # coveralls # docker respx==0.20.1 diff --git a/services/invitations/requirements/_test.txt b/services/invitations/requirements/_test.txt index 832eb739957..fc370fc7ed8 100644 --- a/services/invitations/requirements/_test.txt +++ b/services/invitations/requirements/_test.txt @@ -20,12 +20,9 @@ certifi==2022.12.7 # requests charset-normalizer==3.0.1 # via requests -codecov==2.1.12 - # via -r requirements/_test.in coverage==6.5.0 # via # -r requirements/_test.in - # codecov # coveralls # pytest-cov coveralls==3.3.1 @@ -82,9 +79,7 @@ python-dateutil==2.8.2 python-dotenv==0.21.0 # via -r requirements/_test.in requests==2.28.2 - # via - # codecov - # coveralls + # via coveralls rfc3986==1.5.0 # via # -c requirements/_base.txt diff --git a/services/osparc-gateway-server/tests/system/requirements/_test.txt b/services/osparc-gateway-server/tests/system/requirements/_test.txt index 41dbcbfac4d..39601adb4c2 100644 --- a/services/osparc-gateway-server/tests/system/requirements/_test.txt +++ b/services/osparc-gateway-server/tests/system/requirements/_test.txt @@ -38,12 +38,8 @@ cloudpickle==2.2.1 # -c requirements/../../../../dask-sidecar/requirements/_dask-distributed.txt # dask # distributed -codecov==2.1.12 - # via -r requirements/_test.in coverage==7.2.1 - # via - # codecov - # pytest-cov + # via pytest-cov dask==2023.3.0 # via # -c requirements/../../../../dask-sidecar/requirements/_dask-distributed.txt @@ -170,9 +166,7 @@ pyyaml==5.4.1 # dask-gateway # distributed requests==2.28.2 - # via - # codecov - # docker + # via docker six==1.16.0 # via python-dateutil sortedcontainers==2.4.0 diff --git a/services/storage/requirements/_test.txt b/services/storage/requirements/_test.txt index a0152ef0199..493b646370d 100644 --- a/services/storage/requirements/_test.txt +++ b/services/storage/requirements/_test.txt @@ -61,12 +61,9 @@ click==8.1.3 # via # -c requirements/_base.txt # flask -codecov==2.1.12 - # via -r requirements/_test.in coverage==6.5.0 # via # -r requirements/_test.in - # codecov # coveralls # pytest-cov coveralls==3.3.1 @@ -252,7 +249,6 @@ pyyaml==5.4.1 # openapi-spec-validator requests==2.28.2 # via - # codecov # coveralls # docker # moto diff --git a/services/web/server/requirements/_test.txt b/services/web/server/requirements/_test.txt index 8e2d2cf307e..de72b75afd8 100644 --- a/services/web/server/requirements/_test.txt +++ b/services/web/server/requirements/_test.txt @@ -41,12 +41,9 @@ charset-normalizer==2.0.12 # requests click==8.1.3 # via -r requirements/_test.in -codecov==2.1.12 - # via -r requirements/_test.in coverage==6.5.0 # via # -r requirements/_test.in - # codecov # coveralls # pytest-cov coveralls==3.3.1 @@ -178,7 +175,6 @@ redis==4.4.0 requests==2.28.1 # via # -c requirements/_base.txt - # codecov # coveralls # docker six==1.16.0 From 25d33b78d286385f4d79eb4456e92f109b90b40f Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Wed, 12 Apr 2023 17:25:47 +0200 Subject: [PATCH 4/4] rm in director as well --- services/director/requirements/_test.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/services/director/requirements/_test.txt b/services/director/requirements/_test.txt index acef70ab464..2d0a7310c9b 100644 --- a/services/director/requirements/_test.txt +++ b/services/director/requirements/_test.txt @@ -62,12 +62,9 @@ charset-normalizer==2.0.12 # via # -r requirements/_base.txt # requests -codecov==2.1.10 - # via -r requirements/_test.in coverage==4.5.1 # via # -r requirements/_test.in - # codecov # coveralls # pytest-cov coveralls==2.1.2