Skip to content

Commit 2fc4f49

Browse files
authored
Merge branch 'develop' into patch-1
2 parents 4e4b5e5 + 912a71d commit 2fc4f49

165 files changed

Lines changed: 15647 additions & 3083 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.codecov.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# Codecov configuration for Meshroom
2+
# This configuration prevents CI from failing due to small coverage decreases
3+
# while maintaining quality standards
4+
5+
codecov:
6+
# Require CI to pass before processing results
7+
require_ci_to_pass: yes
8+
9+
coverage:
10+
status:
11+
project:
12+
default:
13+
# Allow coverage to drop by up to 1% without failing
14+
threshold: 1%
15+
# Set a minimum target coverage (adjust based on your current ~77%)
16+
target: 75%
17+
# Only check coverage on lines that are coverable
18+
base: auto
19+
# Ignore if no coverage files are uploaded
20+
if_no_uploads: error
21+
# Don't fail if coverage file not found
22+
if_not_found: success
23+
# Fail if CI failed
24+
if_ci_failed: error
25+
# Only run on these branches
26+
branches:
27+
- develop
28+
- master
29+
- main
30+
31+
patch:
32+
default:
33+
# For new code, allow 2% threshold since new features may need refactoring
34+
threshold: 2%
35+
# New code should aim for 70% coverage (lower than overall project)
36+
target: 70%
37+
# Only run patch coverage on pull requests
38+
only_pulls: true
39+
if_no_uploads: error
40+
if_not_found: success
41+
if_ci_failed: error
42+
43+
precision: 2
44+
round: down
45+
range: "70...95"
46+
47+
# Ignore certain files/directories that shouldn't affect coverage
48+
ignore:
49+
- "setup.py"
50+
- "docs/"
51+
- "scripts/"
52+
- "bin/"
53+
- "localfarm/" # For now ignore localfarm as it has no coverage yet
54+
- "meshroom/submitters/"

.git-blame-ignore-revs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
# Linting: Harmonize docstrings and comments
2+
039e0620ad05d673a2ef9aa501e9a509219671c9
3+
# Linting: Remove all trailing whitespaces
4+
2c2b067f072856f2579c644b5f7858da0275be3c
5+
# [core] attribute: Apply linting
6+
b8c173ddd490dc3bf28b193697d675e44616c6f5
7+
# Linting: Remove trailing whitespaces
8+
04a425decc1b80f0c67e8c4c98c0062d73836684
9+
# [core] Linting: Remove all trailing whitespaces
10+
8be302115edca60c93b1e97de3f457d91c271666
11+
# [tests] Linting: Remove trailing whitespaces
12+
5fe886b6b08fa19082dc0e1bf837fa34c2e2de2d
13+
# [core] Linting: Remove remaining trailing whitespaces
14+
a44537b65a7c53c89c16e71ae207f37fa6554832
15+
# Linting: Fix E203, E225, E231, E261, E302, E303 and W292 warnings
16+
1b5664c8cc54c55fae58a5be9bf63e9af2f5af95
17+
# [ui] Linting: Remove all trailing whitespaces
18+
18d7f609b1a5cd7c43f970770374b649019c1e73
19+
# [core] Linting: Fix import order
20+
aae05532b2409e3bd4c119646afc08656a916cb4
21+
# [core] Linting: Remove all trailing whitespaces
22+
81394d7def1fcbc08cbc2a8721bc1f0a86fe8cc6
23+
# [desc] Linting: Remove trailing whitespaces
24+
0a2ab8cab4f79191b0e7364416701ba561e75b6a
25+
# [desc] Linting: Fix order of the imported modules
26+
adf67e33533a75f5b280e0ee3fc0ece82307199e
127
# [build] `setup.py`: Use double quotes everywhere
228
571de38ef1a9e72e6c1d2a997b60de5bd3caa5bf
329
# [bin] `meshroom_batch`: Minor clean-up in the file

.github/workflows/continuous-integration.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ on:
1818

1919
env:
2020
CI: True
21+
PYTHONPATH: ${{ github.workspace }}
2122

2223
jobs:
2324
build-linux:
@@ -56,6 +57,17 @@ jobs:
5657
uses: codecov/test-results-action@v1
5758
with:
5859
token: ${{ secrets.CODECOV_TOKEN }}
60+
- name: Set up Python 3.9 - meshroom_compute test
61+
uses: actions/setup-python@v4
62+
with:
63+
python-version: 3.9
64+
- name: Install dependencies (Python 3.9) - meshroom_compute test
65+
run: |
66+
python3.9 -m pip install --upgrade pip
67+
python3.9 -m pip install -r requirements.txt --timeout 45
68+
- name: Run imports - meshroom_compute test
69+
run: |
70+
python3.9 bin/meshroom_compute -h
5971
6072
build-windows:
6173
runs-on: windows-latest
@@ -83,3 +95,14 @@ jobs:
8395
- name: Test with pytest
8496
run: |
8597
pytest tests/
98+
- name: Set up Python 3.9 - meshroom_compute test
99+
uses: actions/setup-python@v4
100+
with:
101+
python-version: 3.9
102+
- name: Install dependencies (Python 3.9) - meshroom_compute test
103+
run: |
104+
python3 -m pip install --upgrade pip
105+
python3 -m pip install -r requirements.txt --timeout 45
106+
- name: Run imports - meshroom_compute test
107+
run: |
108+
python3 bin/meshroom_compute -h

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
.DS_Store
1212
# Windows
1313
Thumbs.db
14+
# vscode
15+
.vscode
1416

1517
# python
1618
*.pyc
@@ -19,6 +21,7 @@ __pycache__
1921

2022
# backup files
2123
*.json
24+
!*Config.json
2225

2326
# datas or personal files
2427
/data

0 commit comments

Comments
 (0)