♻️ Maintenance/minor changes on testing on overall repo (ITISFoundation#3348)

Author: pcrespov

CITATION.cff

@@ -49,6 +49,8 @@ authors:
   - given-names: Alexandre
     family-names: Allexandre
     affiliation: "IT'IS Foundation"
+  - given-names: Colin
+    family-names: Rawlings
   - given-names: Tobias
     family-names: Oetiker
     affiliation: "OETIKER+PARTNER AG"

README.md

@@ -8,7 +8,6 @@
 <!-- NOTE: when branched replace `master` in urls -->
 [![Code style: black]](https://github.com/psf/black)
 [![Requires.io]](https://requires.io/github/ITISFoundation/osparc-simcore/requirements/?branch=master "State of third party python dependencies")
-<!-- [![travis-ci]](https://travis-ci.org/ITISFoundation/osparc-simcore "State of CI: build, test and pushing images")  Commented until #2029 is resolved-->
 [![Github-CI Push/PR]](https://github.com/ITISFoundation/osparc-simcore/actions?query=workflow%3A%22Github-CI+Push%2FPR%22+branch%3Amaster)
 [![codecov](https://codecov.io/gh/ITISFoundation/osparc-simcore/branch/master/graph/badge.svg?token=h1rOE8q7ic)](https://codecov.io/gh/ITISFoundation/osparc-simcore)
 [![github.io]](https://itisfoundation.github.io/)
@@ -18,15 +17,18 @@
 
 <!-- ADD HERE ALL BADGE URLS. Use https://shields.io/ -->
 [Code style: black]:https://img.shields.io/badge/code%20style-black-000000.svg
-[Requires.io]:https://img.shields.io/requires/github/ITISFoundation/osparc-simcore.svg?branch=master
-[travis-ci]:https://travis-ci.org/ITISFoundation/osparc-simcore.svg?branch=master
+[Requires.io]:https://requires.io/github/ITISFoundation/osparc-simcore/requirements.svg?branch=master
 [github.io]:https://img.shields.io/website-up-down-green-red/https/itisfoundation.github.io.svg?label=documentation
 [itis.dockerhub]:https://img.shields.io/website/https/hub.docker.com/u/itisfoundation.svg?down_color=red&label=dockerhub%20repos&up_color=green
 [license]:https://img.shields.io/github/license/ITISFoundation/osparc-simcore
 [Github-CI Push/PR]:https://github.com/ITISFoundation/osparc-simcore/workflows/Github-CI%20Push/PR/badge.svg
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=ITISFoundation_osparc-simcore&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=ITISFoundation_osparc-simcore)
 <!------------------------------------------------------>
 
 
+
+
+
 The SIM-CORE, named **o<sup>2</sup>S<sup>2</sup>PARC** – **O**pen **O**nline **S**imulations for **S**timulating **P**eripheral **A**ctivity to **R**elieve **C**onditions – is one of the three integrative cores of the SPARC program’s Data Resource Center (DRC).
 The aim of o<sup>2</sup>S<sup>2</sup>PARC is to establish a comprehensive, freely accessible, intuitive, and interactive online platform for simulating peripheral nerve system neuromodulation/ stimulation and its impact on organ physiology in a precise and predictive manner.
 To achieve this, the platform will comprise both state-of-the art and highly detailed animal and human anatomical models with realistic tissue property distributions that make it possible to perform simulations ranging from the molecular scale up to the complexity of the human body.

api/tests/test_conventions_openapi.py

@@ -16,7 +16,6 @@
 CONVERTED_SUFFIX = "-converted.yaml"
 
 
-# TESTS ----------------------------------------------------------
 # NOTE: parametrizing tests per file makes more visible which file failed
 # NOTE: to debug use the wildcard and select problematic file, e.g. list_files_in_api_specs("*log_message.y*ml"))
 

api/tests/test_full_openapis.py

@@ -5,7 +5,6 @@
 from openapi_spec_validator.exceptions import OpenAPIValidationError
 from utils import is_openapi_schema, list_files_in_api_specs, load_specs
 
-# TESTS ----------------------------------------------------------
 # NOTE: parametrizing tests per file makes more visible which file failed
 # NOTE: to debug use the wildcard and select problematic file, e.g. list_files_in_api_specs("*log_message.y*ml"))
 

api/tests/test_individual_json_schemas.py

@@ -5,7 +5,6 @@
 from utils import is_json_schema, list_files_in_api_specs, load_specs
 
 
-# TESTS ----------------------------------------------------------
 # NOTE: parametrizing tests per file makes more visible which file failed
 # NOTE: to debug use the wildcard and select problematic file, e.g. list_files_in_api_specs("*log_message.y*ml"))
 @pytest.mark.skip(reason="Implementing in PR 324")

api/tests/test_individual_openapi_schemas.py

@@ -136,7 +136,6 @@ def converted_specs_testdir(api_specs_dir, all_api_specs_tails, tmpdir_factory):
     return testdir
 
 
-# TESTS ----------------------------------------------------------
 @pytest.mark.skip(reason="Implementing in PR 324")
 def test_valid_individual_openapi_specs(api_specs_tail, converted_specs_testdir):
     # NOTE: api_specs_tail is a parametrized **fixture**

api/tests/test_repo_data.py

@@ -54,9 +54,6 @@ def project_schema(request, api_specs_dir):
     return _load_data(schema_path)
 
 
-# TESTS --------------------------------------------------
-
-
 @pytest.mark.parametrize("data_path", PROJECTS_PATHS)
 def test_project_against_schema(data_path, project_schema, this_repo_root_dir):
     """

packages/models-library/tests/test_utils_pydantic_models_factory.py

@@ -4,7 +4,7 @@
 # pylint: disable=unused-variable
 
 import json
-from typing import Callable, Dict, Optional
+from typing import Callable, Optional
 
 import pytest
 from faker import Faker
@@ -19,8 +19,6 @@
 from pydantic.types import PositiveInt
 from yarl import URL
 
-# HELPERS ---------------------------------------------------------------
-
 
 def assert_same_fields(model_cls, reference_model_cls):
 
@@ -33,7 +31,7 @@ def assert_same_fields(model_cls, reference_model_cls):
     assert got_fields == expected_fields
 
 
-def _trim_descriptions(schema: Dict):
+def _trim_descriptions(schema: dict):
     data = {}
     for key in schema:
         if key not in ("description", "title"):
@@ -171,9 +169,6 @@ class UserListItem(BaseModel):
     # parses from User
 
 
-# FIXTURES ---------------------------------------------------------------
-
-
 @pytest.fixture
 def fake_user(faker: Faker) -> User:
     """a fake domain model of a User resource"""
@@ -185,9 +180,6 @@ def fake_user(faker: Faker) -> User:
     )
 
 
-# TESTS ------------------------------------------------------------------
-
-
 def test_build_UserCreate_model():
     # In UserCreate, we exclude the primary key
     _BaseUserCreate = copy_model(
@@ -264,7 +256,7 @@ def test_build_UserGet_model(fake_user: User):
 
     assert _trim_descriptions(UserGet.schema()) == _trim_descriptions(_UserGet.schema())
 
-    payload_user: Dict = (
+    payload_user: dict = (
         Envelope[_UserGet].parse_data(fake_user).dict(exclude_unset=True)
     )
 

packages/pytest-simcore/src/pytest_simcore/docker_compose.py

@@ -325,9 +325,6 @@ def pytest_sessionfinish(session: pytest.Session, exitstatus: ExitCode) -> None:
         _save_docker_logs_to_folder(failed_test_directory)
 
 
-# HELPERS ---------------------------------------------
-
-
 def _minio_fix(service_environs: dict) -> dict:
     """this hack ensures that S3 is accessed from the host at all time, thus pre-signed links work."""
     if "S3_ENDPOINT" in service_environs:

packages/pytest-simcore/src/pytest_simcore/docker_swarm.py

@@ -29,9 +29,6 @@
 log = logging.getLogger(__name__)
 
 
-# HELPERS --------------------------------------------------------------------------------
-
-
 class _ResourceStillNotRemoved(Exception):
     pass
 
@@ -142,9 +139,6 @@ def _fetch_and_print_services(
         print(json.dumps({"service": service, "tasks": tasks}, indent=1))
 
 
-# FIXTURES --------------------------------------------------------------------------------
-
-
 @pytest.fixture(scope="session")
 def docker_client() -> Iterator[docker.client.DockerClient]:
     client = docker.from_env()