Merge branch 'master' into is4071/mypy-catalog

ITISFoundation · Apr 12, 2023 · 8ce1ca1 · 8ce1ca1
2 parents 95694ac + fe0711a
commit 8ce1ca1
Show file tree

Hide file tree

Showing 24 changed files with 15 additions and 67 deletions.
diff --git a/.github/workflows/ci-testing-deploy.yml b/.github/workflows/ci-testing-deploy.yml
@@ -981,10 +981,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/[email protected]
-    #   with:
-    #     flags: unittests #optional
 
   unit-test-python-linting:
     needs: changes

diff --git 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
@@ -11,7 +11,7 @@
 --constraint _base.txt
 
 aioboto3
-codecov
+
 coverage
 coveralls
 faker

diff --git 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.in b/services/api-server/requirements/_test.in
@@ -13,7 +13,7 @@
 alembic
 asgi_lifespan
 click
-codecov
+
 coveralls
 docker
 faker

diff --git 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.in b/services/autoscaling/requirements/_test.in
@@ -12,7 +12,7 @@
 
 asgi-lifespan
 
-codecov
+
 coverage
 coveralls
 deepdiff

diff --git 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.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/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.in b/services/datcore-adapter/requirements/_test.in
@@ -6,7 +6,7 @@
 
 
 asgi_lifespan
-codecov
+
 coverage
 coveralls
 faker

diff --git 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.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-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/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/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

diff --git 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/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.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/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.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/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.in b/services/web/server/requirements/_test.in
@@ -11,7 +11,7 @@
 aioresponses
 alembic
 click
-codecov
+
 coverage
 coveralls
 docker

diff --git 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ @@
     alembic
     asgi_lifespan
     click
-    codecov
     coveralls
     docker
     faker
@@ Expand Down @@