Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/workflows/codestyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
pyver: [ "3.10", "3.11", "3.12" ]
pyver: [ "3.10", "3.11", "3.12", "3.13", "3.14" ]
fail-fast: false

steps:
Expand All @@ -28,13 +28,10 @@ jobs:
python-version: ${{ matrix.pyver }}

- name: Install Poetry
run: python3 .github/scripts/poetry_install.py --version 1.8.2
run: python3 .github/scripts/poetry_install.py --version 2.2.1

- name: Install dependencies
run: poetry install --no-root

- name: Check lock file
run: poetry lock --check

- name: Run formatters in check mode
run: poetry run poe checks_codestyle
6 changes: 3 additions & 3 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

strategy:
matrix:
pyver: [ "3.10", "3.11", "3.12" ]
pyver: [ "3.10", "3.11", "3.12", "3.13", "3.14" ]
fail-fast: false

steps:
Expand All @@ -30,7 +30,7 @@ jobs:
python-version: ${{ matrix.pyver }}

- name: Install Poetry
run: python3 .github/scripts/poetry_install.py --version 1.8.2
run: python3 .github/scripts/poetry_install.py --version 2.2.1

- name: Install dependencies
run: poetry install
Expand All @@ -42,7 +42,7 @@ jobs:

- name: Upload test logs
uses: actions/upload-artifact@v4
if: ${{ matrix.pyver == '3.12' }}
if: ${{ matrix.pyver == '3.13' }}
with:
name: goth-logs
path: /tmp/goth-tests
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
python-version: '3.10'

- name: Install Poetry
run: python3 .github/scripts/poetry_install.py --version 1.8.2
run: python3 .github/scripts/poetry_install.py --version 2.2.1

- name: Install dependencies
run: poetry install
Expand All @@ -45,7 +45,7 @@ jobs:
python-version: '3.10'

- name: Install Poetry
run: python3 .github/scripts/poetry_install.py --version 1.8.2
run: python3 .github/scripts/poetry_install.py --version 2.2.1

- name: Get git release tag
run: echo "::set-output name=git-release-tag::goth $(git describe --tags)"
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
python-version: '3.10'

- name: Install Poetry
run: python3 .github/scripts/poetry_install.py --version 1.8.2
run: python3 .github/scripts/poetry_install.py --version 2.2.1

- name: Retrieve the built package
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
python-version: '3.10'

- name: Install Poetry
run: python3 .github/scripts/poetry_install.py --version 1.8.2
run: python3 .github/scripts/poetry_install.py --version 2.2.1

- name: Retrieve the built package
uses: actions/download-artifact@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
pyver: [ "3.10", "3.11", "3.12" ]
pyver: [ "3.10", "3.11", "3.12", "3.13", "3.14" ]
fail-fast: false

steps:
Expand All @@ -28,7 +28,7 @@ jobs:
python-version: ${{ matrix.pyver }}

- name: Install Poetry
run: python3 .github/scripts/poetry_install.py --version 1.8.2
run: python3 .github/scripts/poetry_install.py --version 2.2.1

- name: Install dependencies
run: poetry install
Expand Down
2 changes: 1 addition & 1 deletion goth/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
def make_logs_dir(base_dir: Path) -> Path:
"""Create a unique subdirectory for this test run."""

date_str = datetime.now(tz=timezone.utc).strftime("%Y%m%d_%H%M%S%z")
date_str = datetime.now(tz=timezone.utc).strftime("%Y-%m-%d_%H-%M-%S")
log_dir = base_dir / f"goth_{date_str}"
log_dir.mkdir(parents=True)

Expand Down
2 changes: 1 addition & 1 deletion goth/default-assets/docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.3"
# A docker-compose file defining services used in the test harness

services:

Expand Down
2 changes: 1 addition & 1 deletion goth/runner/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def __init__(
):
# Set up the logging directory for this runner
self.test_name = test_name or self._current_pytest_test_name() or ""
date_str = datetime.now(tz=timezone.utc).strftime("%Y%m%d_%H%M%S%z")
date_str = datetime.now(tz=timezone.utc).strftime("%Y-%m-%d_%H-%M-%S")
self.log_dir = base_log_dir / self.test_name / date_str
self.log_dir.mkdir(parents=True, exist_ok=True)

Expand Down
1 change: 0 additions & 1 deletion goth/runner/container/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ async def build_proxy_image(docker_dir: Path) -> None:
proxy_dockerfile = docker_dir / f"{PROXY_IMAGE}.Dockerfile"

def _setup_context(build_dir: Path) -> None:
nonlocal proxy_dockerfile
for path in required_files:
(build_dir / path.parent).mkdir(parents=True, exist_ok=True)
shutil.copy2(PROJECT_ROOT / path, build_dir / path)
Expand Down
1 change: 1 addition & 0 deletions goth/runner/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ async def _run_command():

out, err = await proc.communicate()

logger.info(f"Command finished with return code: {proc.returncode}")
# Always log output regardless of success/failure
if out:
output_text = out.decode("utf-8").strip()
Expand Down
Loading