Skip to content

Commit c29db17

Browse files
bfutbfut
committed
housekeeping
1 parent 54e00db commit c29db17

7 files changed

Lines changed: 80 additions & 72 deletions

File tree

‎.github/workflows/codeql.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: "CodeQL"
33
on:
44
push:
55
branches: [ "main" ]
6-
pull_request:
7-
# The branches below must be a subset of the branches above
8-
branches: [ "main" ]
6+
# pull_request:
7+
# # The branches below must be a subset of the branches above
8+
# branches: [ "main" ]
99

1010
jobs:
1111
analyze-cpp:
@@ -18,10 +18,10 @@ jobs:
1818

1919
steps:
2020
- name: Checkout repository
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v6
2222

2323
- name: Initialize CodeQL
24-
uses: github/codeql-action/init@v3
24+
uses: github/codeql-action/init@v4
2525
with:
2626
languages: cpp
2727
config-file: ./.github/codeql/codeql-config.yml
@@ -31,7 +31,7 @@ jobs:
3131
./tests/codeql/test_compilers_c++17.sh
3232
3333
- name: Perform CodeQL Analysis
34-
uses: github/codeql-action/analyze@v3
34+
uses: github/codeql-action/analyze@v4
3535
with:
3636
category: "/language:cpp"
3737
upload: False
@@ -48,7 +48,7 @@ jobs:
4848
# output: sarif-results/${{matrix.language}}.sarif
4949

5050
- name: Upload results
51-
uses: github/codeql-action/upload-sarif@v3
51+
uses: github/codeql-action/upload-sarif@v4
5252
with:
5353
sarif_file: sarif-results/cpp.sarif
5454

@@ -62,25 +62,25 @@ jobs:
6262

6363
steps:
6464
- name: Checkout repository
65-
uses: actions/checkout@v4
65+
uses: actions/checkout@v6
6666

6767
- name: Initialize CodeQL
68-
uses: github/codeql-action/init@v3
68+
uses: github/codeql-action/init@v4
6969
with:
7070
languages: python
7171
config-file: ./.github/codeql/codeql-config.yml
7272

7373
- name: Autobuild
74-
uses: github/codeql-action/autobuild@v3
74+
uses: github/codeql-action/autobuild@v4
7575

7676
- name: Perform CodeQL Analysis
77-
uses: github/codeql-action/analyze@v3
77+
uses: github/codeql-action/analyze@v4
7878
with:
7979
category: "/language:python"
8080
upload: False
8181
output: sarif-results
8282

8383
- name: Upload results
84-
uses: github/codeql-action/upload-sarif@v3
84+
uses: github/codeql-action/upload-sarif@v4
8585
with:
8686
sarif_file: sarif-results/python.sarif

.github/workflows/linux.yaml renamed to .github/workflows/linux-latest.yaml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
1-
name: linux
1+
name: linux-latest
22

33
on:
44
workflow_dispatch:
55

6-
push:
7-
branches:
8-
pull_request:
9-
branches:
10-
116
jobs:
127
python:
138
runs-on: ${{ matrix.os }}
149
strategy:
1510
fail-fast: false
1611
matrix:
1712
os: [ ubuntu-latest ]
18-
python-version: [ "3.10", "3.11", "3.12", "3.13", "3.14" ]
19-
13+
python-version: [ "3.14", "3.14t" ]
14+
exclude:
15+
- os: ubuntu-latest
16+
python-version: "3.11"
17+
- os: macos-latest
18+
python-version: "3.11"
2019
name: Python ${{ matrix.python-version }} (${{ matrix.os }})
2120
steps:
2221
- name: Checkout
23-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2423

2524
- name: Set up Python ${{ matrix.python-version }}
26-
uses: actions/setup-python@v5
25+
uses: actions/setup-python@v6
2726
with:
2827
python-version: ${{ matrix.python-version }}
29-
allow-prereleases: true # 3.14
28+
# allow-prereleases: true # 3.15
3029
cache: pip
3130

3231
- name: "pip install"
@@ -40,7 +39,7 @@ jobs:
4039
run: |
4140
echo "import fcecodec as fc; print(f'import fcecodec as fc; fc.__version__={fc.__version__}')" > _version.py; cat _version.py
4241
python -c "import subprocess; import sys; retcode = subprocess.call([ sys.executable, '_version.py' ]); print('Exit code', retcode); sys.exit(0)"
43-
python -c "import fcecodec as fc; help(fc)"
42+
python -c "import fcecodec as fc; help(fc)"
4443
- name: "Install requirements"
4544
shell: bash
4645
timeout-minutes: 1
@@ -51,4 +50,7 @@ jobs:
5150
- name: "pytest"
5251
shell: bash
5352
run: |
54-
pytest -s -vv
53+
pytest -s -vv ./tests/test_smoketest.py
54+
pytest -s -vv ./tests/test_diff.py
55+
pytest -s -vv ./tests/test_scripts.py
56+
pytest -s -vv ./tests/blender/test_fixblender.py

.github/workflows/macos.yaml renamed to .github/workflows/macos-latest.yaml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
1-
name: macos
1+
name: macos-latest
22

33
on:
44
workflow_dispatch:
55

6-
push:
7-
branches:
8-
pull_request:
9-
branches:
10-
116
jobs:
127
python:
138
runs-on: ${{ matrix.os }}
149
strategy:
1510
fail-fast: false
1611
matrix:
1712
os: [ macos-latest ]
18-
python-version: [ "3.10", "3.11", "3.12", "3.13", "3.14" ]
19-
13+
python-version: [ "3.14", "3.14t" ]
14+
exclude:
15+
- os: ubuntu-latest
16+
python-version: "3.11"
17+
- os: macos-latest
18+
python-version: "3.11"
2019
name: Python ${{ matrix.python-version }} (${{ matrix.os }})
2120
steps:
2221
- name: Checkout
23-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2423

2524
- name: Set up Python ${{ matrix.python-version }}
26-
uses: actions/setup-python@v5
25+
uses: actions/setup-python@v6
2726
with:
2827
python-version: ${{ matrix.python-version }}
29-
allow-prereleases: true # 3.14
28+
# allow-prereleases: true # 3.15
3029
cache: pip
3130

3231
- name: "pip install"
@@ -40,7 +39,7 @@ jobs:
4039
run: |
4140
echo "import fcecodec as fc; print(f'import fcecodec as fc; fc.__version__={fc.__version__}')" > _version.py; cat _version.py
4241
python -c "import subprocess; import sys; retcode = subprocess.call([ sys.executable, '_version.py' ]); print('Exit code', retcode); sys.exit(0)"
43-
python -c "import fcecodec as fc; help(fc)"
42+
python -c "import fcecodec as fc; help(fc)"
4443
- name: "Install requirements"
4544
shell: bash
4645
timeout-minutes: 1
@@ -51,4 +50,7 @@ jobs:
5150
- name: "pytest"
5251
shell: bash
5352
run: |
54-
pytest -s -vv
53+
pytest -s -vv ./tests/test_smoketest.py
54+
pytest -s -vv ./tests/test_diff.py
55+
pytest -s -vv ./tests/test_scripts.py
56+
pytest -s -vv ./tests/blender/test_fixblender.py

‎.github/workflows/release_scripts.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: release_scripts
22

33
on:
4-
[push, pull_request, workflow_dispatch]
4+
release:
5+
types: [published]
6+
workflow_dispatch:
57

68
env:
79
DEST: fcecodec
@@ -12,7 +14,7 @@ jobs:
1214
name: Ubuntu
1315
steps:
1416

15-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v6
1618
# with:
1719
# repository: "bfut/fcecodec"
1820

@@ -47,7 +49,7 @@ jobs:
4749
7z x -y "${{ env.DEST }}${{ env.version }}_scripts.zip" -o"${{ env.DEST }}${{ env.version }}_scripts"
4850
4951
- name: Store archive (fcecodec_scripts)
50-
uses: actions/upload-artifact@v4
52+
uses: actions/upload-artifact@v6
5153
with:
5254
name: "${{ env.DEST }}${{ env.version }}_scripts"
5355
path: "${{ env.DEST }}${{ env.version }}_scripts"

‎.github/workflows/wheel.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: wheel
22

33
on:
4-
[push, pull_request, workflow_dispatch]
4+
release:
5+
types: [published]
6+
workflow_dispatch:
57

68
jobs:
79
build_wheels:
@@ -10,27 +12,26 @@ jobs:
1012
strategy:
1113
matrix:
1214
# https://github.com/actions/runner-images
13-
# arm64: macos-14, macos-15
14-
# x86_64: macos-13
15-
os: [ubuntu-latest, windows-latest, macos-13, macos-14, macos-15]
15+
# arm64: macos-latest
16+
# x86_64: macos-15-intel
17+
os: [ubuntu-latest, windows-latest, macos-15-intel, macos-latest]
1618

1719
steps:
18-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v6
1921

2022
- name: Build wheels
2123
# https://github.com/pypa/cibuildwheel/releases
22-
uses: pypa/cibuildwheel@v3.1.0
24+
uses: pypa/cibuildwheel@v3.3.0
2325
env:
24-
CIBW_ARCHS_WINDOWS: "AMD64 x86"
25-
CIBW_FREE_THREADED_SUPPORT: 1
26+
CIBW_ARCHS_WINDOWS: "AMD64"
27+
CIBW_ARCHS_LINUX: "x86_64"
2628
with:
2729
package-dir: "."
2830
output-dir: "./wheelhouse"
2931
config-file: "./pyproject.toml"
3032

31-
- uses: actions/upload-artifact@v4
33+
- uses: actions/upload-artifact@v6
3234
with:
33-
# name: fcecodec-cp-wheels-${{ matrix.os }} #-${{ strategy.job-index }}
3435
name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
3536
path: ./wheelhouse/*.whl
3637

@@ -39,15 +40,15 @@ jobs:
3940
name: Make SDist
4041
runs-on: ubuntu-latest
4142
steps:
42-
- uses: actions/checkout@v4
43+
- uses: actions/checkout@v6
4344
with:
4445
fetch-depth: 0 # Optional, use if you use setuptools_scm
4546
fetch-tags: true # Optional, use if you use setuptools_scm
4647

4748
- name: Build SDist
4849
run: pipx run build --sdist
4950

50-
- uses: actions/upload-artifact@v4
51+
- uses: actions/upload-artifact@v6
5152
with:
5253
name: cibw-sdist
5354
path: dist/*.tar.gz
@@ -59,10 +60,9 @@ jobs:
5960
permissions:
6061
id-token: write
6162
runs-on: ubuntu-latest
62-
# if: github.event_name == 'release' && github.event.action == 'published'
63-
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/1')
63+
if: github.event_name == 'release' && github.event.action == 'published' && startsWith(github.ref, 'refs/tags/2')
6464
steps:
65-
- uses: actions/download-artifact@v4
65+
- uses: actions/download-artifact@v7
6666
with:
6767
pattern: cibw-*
6868
path: dist

.github/workflows/windows.yaml renamed to .github/workflows/windows-latest.yaml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
1-
name: windows
1+
name: windows-latest
22

33
on:
44
workflow_dispatch:
55

6-
push:
7-
branches:
8-
pull_request:
9-
branches:
10-
116
jobs:
127
python:
138
runs-on: ${{ matrix.os }}
149
strategy:
1510
fail-fast: false
1611
matrix:
1712
os: [ windows-latest ]
18-
python-version: [ "3.10", "3.11", "3.12", "3.13", "3.14" ]
19-
13+
python-version: [ "3.14", "3.14t" ]
14+
exclude:
15+
- os: ubuntu-latest
16+
python-version: "3.11"
17+
- os: macos-latest
18+
python-version: "3.11"
2019
name: Python ${{ matrix.python-version }} (${{ matrix.os }})
2120
steps:
2221
- name: Checkout
23-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2423

2524
- name: Set up Python ${{ matrix.python-version }}
26-
uses: actions/setup-python@v5
25+
uses: actions/setup-python@v6
2726
with:
2827
python-version: ${{ matrix.python-version }}
29-
allow-prereleases: true # 3.14
28+
# allow-prereleases: true # 3.15
3029
cache: pip
3130

3231
- name: "pip install"
@@ -40,7 +39,7 @@ jobs:
4039
run: |
4140
echo "import fcecodec as fc; print(f'import fcecodec as fc; fc.__version__={fc.__version__}')" > _version.py; cat _version.py
4241
python -c "import subprocess; import sys; retcode = subprocess.call([ sys.executable, '_version.py' ]); print('Exit code', retcode); sys.exit(0)"
43-
python -c "import fcecodec as fc; help(fc)"
42+
python -c "import fcecodec as fc; help(fc)"
4443
- name: "Install requirements"
4544
shell: bash
4645
timeout-minutes: 1
@@ -51,4 +50,7 @@ jobs:
5150
- name: "pytest"
5251
shell: bash
5352
run: |
54-
pytest -s -vv
53+
pytest -s -vv ./tests/test_smoketest.py
54+
pytest -s -vv ./tests/test_diff.py
55+
pytest -s -vv ./tests/test_scripts.py
56+
pytest -s -vv ./tests/blender/test_fixblender.py

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ conversion tutorial
2222
[fcecodec-example.ipynb](https://colab.research.google.com/github/bfut/notebooks/blob/main/fcecodec/fcecodec-example.ipynb)
2323
[![fcecodec-example.ipynb](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/bfut/notebooks/blob/main/fcecodec/fcecodec-example.ipynb)
2424

25-
## Key features
25+
## Features
2626
* Io: full FCE implementation (FCE3, FCE4, FCE4M) with validation
2727
* Io: decodes/encodes transparently
2828
* Io: exports to Wavefront OBJ
@@ -32,7 +32,7 @@ conversion tutorial
3232
* Op: inserts part from another mesh
3333
* Op: changes part order, copies part, merges parts, deletes part
3434
* Op: deletes triangles, vertices
35-
* Stats: print stats
35+
* Stats: prints stats
3636

3737
## References
3838
FCE3 specifications taken from [1].
@@ -45,7 +45,7 @@ Unofficial FCE4M specifications, own work.
4545
[3] Addict (1999) [_NFS4 FCE file format specifications_](/references/nfs4_fce_spec_by_Addict.txt)<br/>
4646

4747
## Information
48-
__fcecodec License:__ GNU General Public License v2.0+<br/>
48+
__fcecodec License:__ GNU General Public License v3.0+<br/>
4949
__Website:__ <https://github.com/bfut/fcecodec>
5050

5151
Portions copyright, see each source file for more information.

0 commit comments

Comments
 (0)