Skip to content

Commit b3de713

Browse files
authored
Merge pull request #1502 from compas-dev/prep-last-2.x
Prepare last 2.x
2 parents 565586e + f56b77a commit b3de713

File tree

7 files changed

+16
-10
lines changed

7 files changed

+16
-10
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ on:
44
push:
55
branches:
66
- main
7+
- '*.LTS'
78
pull_request:
89
branches:
910
- main
11+
- '*.LTS'
1012

1113
jobs:
1214
build:

.github/workflows/coverage.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ on:
44
push:
55
branches:
66
- main
7+
- '*.LTS'
78
pull_request:
89
branches:
910
- main
11+
- '*.LTS'
1012

1113
jobs:
1214
coverage:

.github/workflows/docs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- '*.LTS'
78
tags:
89
- 'v*'
910
pull_request_review:

.github/workflows/ironpython.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ on:
44
push:
55
branches:
66
- main
7+
- '*.LTS'
78
pull_request:
89
branches:
910
- main
11+
- '*.LTS'
1012

1113
jobs:
1214
build:

.github/workflows/pr-checks.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches:
66
- main
77
- master
8+
- '*.LTS'
89

910
jobs:
1011
build:

conftest.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
1+
from pathlib import Path
12
import math
2-
33
import numpy
44
import pytest
55

66
import compas
77
from compas.geometry import allclose
88

99

10-
def pytest_ignore_collect(path):
11-
if "rhino" in str(path):
12-
return True
13-
14-
if "blender" in str(path):
10+
def pytest_ignore_collect(collection_path: Path, config):
11+
# Skip anything under rhino/blender/ghpython, or files ending with _cli.py
12+
parts_lower = {p.lower() for p in collection_path.parts}
13+
if {"rhino", "blender", "ghpython"} & parts_lower:
1514
return True
1615

17-
if "ghpython" in str(path):
16+
if collection_path.name.endswith("_cli.py"):
1817
return True
1918

20-
if str(path).endswith("_cli.py"):
21-
return True
19+
# return None -> don't ignore
20+
return None
2221

2322

2423
@pytest.fixture(autouse=True)

docs/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ def setup(app):
139139
"image_dark": "_static/compas_icon_white.png",
140140
"text": "COMPAS docs",
141141
},
142-
"announcement": "This is the documentation of the first stable release of COMPAS 2. If you have feedback, please give it here: <a href='https://github.com/compas-dev/compas/issues'>COMPAS issue tracker</a>.",
143142
"navigation_depth": 2,
144143
}
145144

0 commit comments

Comments
 (0)