Resolve merge conflict and preserve installer hardening

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [1.1.3] - 2026-02-12
+
+* Increase Playwright step wait from 200ms to 1000ms to improve CI stability during Matomo installation.
+
+
 ## [1.1.2] - 2025-12-24
 
 * **Improved error visibility during Matomo installation**: When the setup fails (for example due to an invalid admin email or missing required fields), the installer now **prints the actual Matomo error messages to the logs**, instead of failing with a generic error.

flake.nix

@@ -20,7 +20,7 @@
       rec {
         matomo-bootstrap = python.pkgs.buildPythonApplication {
           pname = "matomo-bootstrap";
-          version = "1.1.2"; # keep in sync with pyproject.toml
+          version = "1.1.3"; # keep in sync with pyproject.toml
           pyproject = true;
           src = self;
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "matomo-bootstrap"
-version = "1.1.2"
+version = "1.1.3"
 description = "Headless bootstrap tooling for Matomo (installation + API token provisioning)"
 readme = "README.md"
 requires-python = ">=3.10"

src/matomo_bootstrap/installers/web.py

@@ -395,9 +395,7 @@ class WebInstaller(Installer):
 
             try:
                 page.goto(base_url, wait_until="domcontentloaded")
-                _wait_for_installer_interactive(
+                _wait_for_installer_interactive(page, timeout_s=INSTALLER_READY_TIMEOUT_S)
-                    page, timeout_s=INSTALLER_READY_TIMEOUT_S
-                )
                 _page_warnings(page)
 
                 progress_deadline = time.time() + INSTALLER_STEP_DEADLINE_S