Is1838/fogbugz areas per product (#1850)

Resolves #1838: Adds different links to fogbugz depending on product

* Adds settings for front-end apps
* Simplified fogbugz url
* Adapts new name of pytest_simcore. plugin
* Simplified makefile in tests/environment-setup
* add extra product fg cfg links
* Upgrades all aio-pika to 6.7.1.


Co-authored-by: Odei Maiz <[email protected]>

Author: pcrespov

.env-devel

@@ -60,8 +60,10 @@ WEBSERVER_RESOURCES_DELETION_TIMEOUT_SECONDS=900
 WEBSERVER_GARBAGE_COLLECTION_INTERVAL_SECONDS=30
 WEBSERVER_MANUAL_MAIN_URL=http://docs.osparc.io/
 WEBSERVER_MANUAL_EXTRA_URL=https://itisfoundation.github.io/osparc-manual-z43/
-WEBSERVER_FOGBUGZ_URL=htpps://z43.fogbugz.com
-WEBSERVER_FOGBUGZ_PROJECT_ID=45
+WEBSERVER_FOGBUGZ_LOGIN_URL=https://z43.fogbugz.com/login
+WEBSERVER_FOGBUGZ_NEWCASE_URL=https://z43.fogbugz.com/f/cases/new?command=new&pg=pgEditBug&ixProject=45&ixArea=449
+WEBSERVER_S4L_FOGBUGZ_NEWCASE_URL=https://z43.fogbugz.com/f/cases/new?command=new&pg=pgEditBug&ixProject=45&ixArea=458
+WEBSERVER_TIS_FOGBUGZ_NEWCASE_URL=https://z43.fogbugz.com/f/cases/new?command=new&pg=pgEditBug&ixProject=45&ixArea=459
 WEBSERVER_FEEDBACK_FORM_URL=https://docs.google.com/forms/d/e/1FAIpQLSe232bTigsM2zV97Kjp2OhCenl6o9gNGcDFt2kO_dfkIjtQAQ/viewform?usp=sf_link
 
 # for debugging

packages/postgres-database/tests/conftest.py

@@ -11,6 +11,8 @@
 import yaml
 from aiopg.sa.engine import Engine
 
+pytest_plugins = ["pytest_simcore.repository_paths"]
+
 
 @pytest.fixture(scope="session")
 def postgres_service(docker_services, docker_ip, docker_compose_file) -> str:

packages/postgres-database/tests/test_classifiers.py

@@ -18,7 +18,6 @@
 from simcore_postgres_database.models.classifiers import group_classifiers
 from simcore_postgres_database.models.groups import groups
 
-pytest_plugins = ["pytest_simcore.environs"]
 
 
 @pytest.fixture

packages/pytest-simcore/README.md

@@ -14,7 +14,7 @@ To install in a modules (e.g. web/server):
 ```python
 from pytest_simcore.helpers.utils_assert import foo
 
-pytest_plugins = ["pytest_simcore.environs"]
+pytest_plugins = ["pytest_simcore.repository_paths"]
 
 
 def test_something( some_pytest_simcore_fixture, ... )

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

@@ -0,0 +1,18 @@
+# pylint: disable=redefined-outer-name
+
+from pathlib import Path
+from typing import Dict
+
+import pytest
+
+from .helpers.utils_environs import load_env
+
+
+@pytest.fixture(scope="session")
+def env_devel_config(env_devel_file: Path) -> Dict[str,str]:
+    env_devel = {}
+    # TODO: use instead from dotenv import dotenv_values
+    # env_devel = dotenv_values(env_devel_file, verbose=True, interpolate=True)
+    with env_devel_file.open() as f:
+        env_devel = load_env(f)
+    return env_devel

…t-simcore/src/pytest_simcore/environs.py …e/src/pytest_simcore/repository_paths.pypackages/pytest-simcore/src/pytest_simcore/environs.py renamed to packages/pytest-simcore/src/pytest_simcore/repository_paths.py packages/pytest-simcore/src/pytest_simcore/environs.py renamed to packages/pytest-simcore/src/pytest_simcore/repository_paths.py

@@ -11,7 +11,7 @@
 @pytest.fixture(scope="session")
 def osparc_simcore_root_dir(request) -> Path:
     """ osparc-simcore repo root dir """
-    WILDCARD = "packages/pytest-simcore/src/pytest_simcore/environs.py"
+    WILDCARD = "packages/pytest-simcore/src/pytest_simcore/__init__.py"
     ROOT = Path("/")
 
     test_dir = Path(request.session.fspath)  # expected test dir in simcore
@@ -55,6 +55,13 @@ def services_dir(osparc_simcore_root_dir: Path) -> Path:
     return services_folder
 
 
+@pytest.fixture(scope="session")
+def services_docker_compose_file(services_dir):
+    dcpath = services_dir / "docker-compose.yml"
+    assert dcpath.exists()
+    return dcpath
+
+
 @pytest.fixture(scope="module")
 def temp_folder(request, tmpdir_factory) -> Path:
     tmp = Path(tmpdir_factory.mktemp(f"tmp_module_{request.module.__name__}"))

packages/pytest-simcore/tests/test_fixture_environs.py

@@ -16,7 +16,7 @@ def test_root_dir_with_installed_plugin(testdir):
     testdir.makepyfile(
         f"""
         from pathlib import Path
-        pytest_plugins = ["pytest_simcore.environs"]
+        pytest_plugins = ["pytest_simcore.repository_paths"]
 
         def test_sth(osparc_simcore_root_dir):
             assert osparc_simcore_root_dir == Path('{repo_base_dir}')

packages/pytest-simcore/tests/test_simcore_plugin.py

@@ -6,7 +6,7 @@ def test_using_pytest_simcore_fixture(testdir):
 
     # create a temporary pytest test module
     testdir.makepyfile("""
-        pytest_plugins = ["pytest_simcore.environs"]
+        pytest_plugins = ["pytest_simcore.repository_paths"]
 
         def test_sth(request):
             assert request.config.getoption("--keep-docker-up") == True

packages/simcore-sdk/tests/integration/conftest.py

@@ -24,7 +24,7 @@
 
 # FIXTURES
 pytest_plugins = [
-    "pytest_simcore.environs",
+    "pytest_simcore.repository_paths",
     "pytest_simcore.docker_compose",
     "pytest_simcore.docker_swarm",
     "pytest_simcore.postgres_service",

services/catalog/tests/unit/conftest.py

@@ -12,7 +12,7 @@
 import simcore_service_catalog
 
 pytest_plugins = [
-    "pytest_simcore.environs",
+    "pytest_simcore.repository_paths",
     "pytest_simcore.service_environs",
     "pytest_simcore.schemas",
     "pytest_simcore.docker_registry",