Merge branch 'release/0.7.0'

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.7.0] - 2021-09-09
+
+### Breaking changes
+- make default presets.json compatible with yagna 0.8+ [080a95f](https://github.com/golemfactory/goth/commit/080a95fd8c5b41b69da216cfdee6f0ac4dbe3acc)
+- update mock zkSync server version [#544](https://github.com/golemfactory/goth/pull/544)
+
+### Features
+- disconnect yagna containers before stopping Docker network [#540](https://github.com/golemfactory/goth/pull/540)
+- enable creating detached API assertions [#538](https://github.com/golemfactory/goth/pull/538)
+- enable MITM proxy for requestor probes [#535](https://github.com/golemfactory/goth/pull/535)
+
+### Other changes
+- update `typing_extensions` to 3.10.0+ [cc956e1](https://github.com/golemfactory/goth/commit/cc956e14447b5d6f382b7f668e385fcee9c209be)
+
 ## [0.6.3] - 2021-08-16
 
 ### Bugfixes

goth/default-assets/goth-config.yml

@@ -15,7 +15,7 @@ docker-compose:
 
     # binary-path: ...
     # deb-path: ...
-    # branch: ...
+    branch: release/v0.8
     # commit-hash: ...
     # release-tag: ...
 

goth/default-assets/provider/presets.json

@@ -1,27 +1,40 @@
 {
+  "ver": "V1",
   "active": [
-    "wasmtime",
-    "vm"
+    "wasm",
+    "vm",
+    "test-counters"
   ],
   "presets": [
     {
-      "name": "wasmtime",
+      "name": "wasm",
       "exeunit-name": "wasmtime",
       "pricing-model": "linear",
+      "initial-price": 0,
       "usage-coeffs": {
-        "initial": 0.0,
-        "duration": 0.0002777777777777778,
-        "cpu": 0.001388888888888889
+        "golem.usage.duration_sec": 0.0001,
+        "golem.usage.cpu_sec": 0.0001
       }
     },
     {
       "name": "vm",
       "exeunit-name": "vm",
       "pricing-model": "linear",
+      "initial-price": 0,
       "usage-coeffs": {
-        "initial": 0.0,
-        "cpu": 0.001388888888888889,
-        "duration": 0.0002777777777777778
+        "golem.usage.duration_sec": 0.0001,
+        "golem.usage.cpu_sec": 0.0001
+      }
+    },
+    {
+      "name": "test-counters",
+      "exeunit-name": "test-counters",
+      "pricing-model": "linear",
+      "initial-price": 0,
+      "usage-coeffs": {
+        "golem.usage.duration_sec": 0.0001,
+        "golem.usage.cpu_sec": 0.0001,
+        "golem.usage.custom.counter": 0.0003
       }
     }
   ]

pyproject.toml

@@ -4,7 +4,7 @@ exclude= '/(\.eggs|\.git|\.hg|\.mypy_cache|\.nox|\.tox|\.venv|venv|\.svn|_build|
 
 [tool.poetry]
 name = "goth"
-version = "0.6.6"
+version = "0.7.0"
 description = "Golem Test Harness - integration testing framework"
 authors = ["Golem Factory <[email protected]>"]
 license = "GPL-3.0"
@@ -26,13 +26,13 @@ python = "^3.8"
 aiohttp = "3.7.4"
 ansicolors = "^1.1.0"
 docker-compose = "^1.29"
-docker = "=5.0.0"
+docker = "^5.0"
 dpath = "^2.0"
 func_timeout = "4.3.5"
 mitmproxy = "^5.3"
 pyyaml = "^5.4"
 transitions = "^0.8"
-typing_extensions = "3.7.4.3"
+typing_extensions = "^3.10.0"
 urllib3 = "^1.26"
 ya-aioclient = "^0.6"
 ghapi = "^0.1.16"

test/integration/conftest.py

@@ -8,7 +8,7 @@
 from goth.runner.log import configure_logging
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def log_dir() -> Path:
     """Return path to dir where goth test session logs should be placed."""
     base_dir = Path("/", "tmp", "goth-tests")