diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 10e1fa60fdbb..2e2893bb386e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,9 +4,11 @@ on: push: branches: - main + - '*.LTS' pull_request: branches: - main + - '*.LTS' jobs: build: diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 2b37aa768418..46772f0c0d3c 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -4,9 +4,11 @@ on: push: branches: - main + - '*.LTS' pull_request: branches: - main + - '*.LTS' jobs: coverage: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 058d53c398ed..5781a2449bb4 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - '*.LTS' tags: - 'v*' pull_request_review: diff --git a/.github/workflows/ironpython.yml b/.github/workflows/ironpython.yml index 472d4f91cfd6..6076db0850c3 100644 --- a/.github/workflows/ironpython.yml +++ b/.github/workflows/ironpython.yml @@ -4,9 +4,11 @@ on: push: branches: - main + - '*.LTS' pull_request: branches: - main + - '*.LTS' jobs: build: diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index fa70e3121b58..592e42915fa0 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -5,6 +5,7 @@ on: branches: - main - master + - '*.LTS' jobs: build: diff --git a/conftest.py b/conftest.py index 88062fab2d30..8c573e700d4b 100644 --- a/conftest.py +++ b/conftest.py @@ -1,5 +1,5 @@ +from pathlib import Path import math - import numpy import pytest @@ -7,18 +7,17 @@ from compas.geometry import allclose -def pytest_ignore_collect(path): - if "rhino" in str(path): - return True - - if "blender" in str(path): +def pytest_ignore_collect(collection_path: Path, config): + # Skip anything under rhino/blender/ghpython, or files ending with _cli.py + parts_lower = {p.lower() for p in collection_path.parts} + if {"rhino", "blender", "ghpython"} & parts_lower: return True - if "ghpython" in str(path): + if collection_path.name.endswith("_cli.py"): return True - if str(path).endswith("_cli.py"): - return True + # return None -> don't ignore + return None @pytest.fixture(autouse=True) diff --git a/docs/conf.py b/docs/conf.py index 9e33707b50be..224f7bb03a2c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -139,7 +139,6 @@ def setup(app): "image_dark": "_static/compas_icon_white.png", "text": "COMPAS docs", }, - "announcement": "This is the documentation of the first stable release of COMPAS 2. If you have feedback, please give it here: COMPAS issue tracker.", "navigation_depth": 2, }