Skip to content

Commit bf53705

Browse files
authored
updates & more test (#44)
* stl codec bug fixes * Bump python to min 3.11, also black & click. All tests passing * added 28 more test, now 623 in total * update README * update TECH_README.md * bump to py 3.13 * bump to py 3.11 * ci: upgrade actions for Node 24 transition and align python jobs * ci: fix black lint target and formatting * And some documentation about the GitHub workflows to the README.
1 parent 6a6076a commit bf53705

25 files changed

+2973
-266
lines changed

.github/workflows/lint.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ on:
99
jobs:
1010
run-black-lint:
1111
runs-on: ubuntu-latest
12-
strategy:
13-
fail-fast: false
14-
matrix:
15-
python-version: ["3.10"]
1612
steps:
17-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v6
14+
- name: Set up Python
15+
uses: actions/setup-python@v6
16+
with:
17+
python-version: "3.13"
1818
- name: Install CadQuery and pytest
1919
shell: bash --login {0}
2020
run: |
21-
pip install --upgrade pip
22-
pip install -e .
23-
pip install -e .[dev]
21+
python -m pip install --upgrade pip
22+
python -m pip install -e .
23+
python -m pip install -e .[dev]
2424
- name: Run tests
2525
shell: bash --login {0}
2626
run: |
27-
black --diff --check .
27+
black --diff --check --target-version py313 --extend-exclude 'tests/testdata/syntax_error.py' .

.github/workflows/pyinstaller-builds-actions.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
build-linux:
1313
runs-on: ubuntu-20.04
1414
steps:
15-
- uses: actions/checkout@v2
16-
- uses: conda-incubator/setup-miniconda@v2
15+
- uses: actions/checkout@v6
16+
- uses: conda-incubator/setup-miniconda@v3
1717
with:
1818
# miniconda-version: "latest"
1919
miniforge-version: latest
2020
auto-update-conda: true
21-
python-version: 3.8
21+
python-version: 3.11
2222
activate-environment: test
2323
- name: Install CadQuery and pyinstaller
2424
shell: bash --login {0}
@@ -32,19 +32,19 @@ jobs:
3232
run: |
3333
mamba info
3434
pyinstaller cq-cli_pyinstaller.spec ${{ github.event.inputs.type }}
35-
- uses: actions/upload-artifact@v2
35+
- uses: actions/upload-artifact@v7
3636
with:
3737
name: cq-cli-Linux-x86_64
3838
path: dist
3939
build-macos:
4040
runs-on: macos-latest
4141
steps:
42-
- uses: actions/checkout@v2
43-
- uses: conda-incubator/setup-miniconda@v2
42+
- uses: actions/checkout@v6
43+
- uses: conda-incubator/setup-miniconda@v3
4444
with:
4545
miniconda-version: "latest"
4646
auto-update-conda: true
47-
python-version: 3.8
47+
python-version: 3.11
4848
activate-environment: test
4949
- name: Install CadQuery and pyinstaller
5050
shell: bash --login {0}
@@ -58,19 +58,19 @@ jobs:
5858
run: |
5959
conda info
6060
pyinstaller cq-cli_pyinstaller.spec ${{ github.event.inputs.type }}
61-
- uses: actions/upload-artifact@v2
61+
- uses: actions/upload-artifact@v7
6262
with:
6363
name: cq-cli-MacOS
6464
path: dist
6565
build-windows:
6666
runs-on: windows-latest
6767
steps:
68-
- uses: actions/checkout@v2
69-
- uses: conda-incubator/setup-miniconda@v2
68+
- uses: actions/checkout@v6
69+
- uses: conda-incubator/setup-miniconda@v3
7070
with:
7171
miniforge-version: latest
7272
# auto-update-conda: true
73-
python-version: 3.8
73+
python-version: 3.11
7474
activate-environment: test
7575
- name: Install CadQuery and pyinstaller
7676
shell: pwsh
@@ -86,7 +86,7 @@ jobs:
8686
Get-ChildItem -Path C:\Miniconda3\envs\test\ -Filter OCP* -Recurse
8787
mamba info
8888
pyinstaller cq-cli_pyinstaller.spec ${{ github.event.inputs.type }}
89-
- uses: actions/upload-artifact@v2
89+
- uses: actions/upload-artifact@v7
9090
with:
9191
name: cq-cli-Windows
9292
path: dist

.github/workflows/pyinstaller.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
build-linux:
1111
runs-on: ubuntu-20.04
1212
steps:
13-
- uses: actions/checkout@v2
14-
- uses: actions/setup-python@v4
13+
- uses: actions/checkout@v6
14+
- uses: actions/setup-python@v6
1515
with:
16-
python-version: '3.10'
16+
python-version: '3.11'
1717
- name: Install dependencies
1818
run: |
1919
pip install --upgrade pip
@@ -24,17 +24,17 @@ jobs:
2424
- name: Run PyInstaller build
2525
run: |
2626
pyinstaller pyinstaller.spec ${{ github.event.inputs.type }}
27-
- uses: actions/upload-artifact@v2
27+
- uses: actions/upload-artifact@v7
2828
with:
2929
name: cq-cli-Linux-x86_64
3030
path: dist
3131
build-macos:
3232
runs-on: macos-latest
3333
steps:
34-
- uses: actions/checkout@v2
35-
- uses: actions/setup-python@v4
34+
- uses: actions/checkout@v6
35+
- uses: actions/setup-python@v6
3636
with:
37-
python-version: '3.10'
37+
python-version: '3.11'
3838
- name: Install dependencies
3939
run: |
4040
pip install --upgrade pip
@@ -45,17 +45,17 @@ jobs:
4545
- name: Run PyInstaller build
4646
run: |
4747
pyinstaller pyinstaller.spec ${{ github.event.inputs.type }}
48-
- uses: actions/upload-artifact@v2
48+
- uses: actions/upload-artifact@v7
4949
with:
5050
name: cq-cli-MacOS
5151
path: dist
5252
build-windows:
5353
runs-on: windows-latest
5454
steps:
55-
- uses: actions/checkout@v2
56-
- uses: actions/setup-python@v4
55+
- uses: actions/checkout@v6
56+
- uses: actions/setup-python@v6
5757
with:
58-
python-version: '3.10'
58+
python-version: '3.11'
5959
- name: Install dependencies
6060
run: |
6161
pip install --upgrade pip
@@ -69,7 +69,7 @@ jobs:
6969
# CPATH=$pythonLocation/include/python${{ matrix.python-version }}m
7070
# echo "CPATH=$CPATH" >> $GITHUB_ENV
7171
pyinstaller pyinstaller.spec ${{ github.event.inputs.type }}
72-
- uses: actions/upload-artifact@v2
72+
- uses: actions/upload-artifact@v7
7373
with:
7474
name: cq-cli-Windows
7575
path: dist

.github/workflows/test_freecad.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Checkout project
10-
uses: actions/checkout@v4
10+
uses: actions/checkout@v6
1111

1212
- name: Install and Test
1313
run: |

.github/workflows/tests.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,23 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
python-version: ["3.10"]
14+
python-version: ["3.11"]
1515
os: [ubuntu-22.04] # windows-latest , macos-latest
1616
runs-on: ${{ matrix.os }}
1717
steps:
1818
- name: Install Dependencies (Linux)
1919
run: sudo apt-get update && sudo apt install -y libgl1-mesa-glx
20-
if: matrix.os == 'ubuntu-20.04'
21-
- uses: actions/checkout@v2
20+
if: matrix.os == 'ubuntu-22.04'
21+
- uses: actions/checkout@v6
22+
- name: Set up Python
23+
uses: actions/setup-python@v6
24+
with:
25+
python-version: ${{ matrix.python-version }}
2226
- name: Install CadQuery and pytest
2327
run: |
24-
pip3 install --upgrade pip
25-
pip3 install -e .
26-
pip3 install -e .[dev]
28+
python -m pip install --upgrade pip
29+
python -m pip install -e .
30+
python -m pip install -e .[dev]
2731
- name: Run tests
2832
run: |
29-
python3 -m pytest -v --ignore=tests/test_freecad.py
33+
python -m pytest -v --ignore=tests/test_freecad.py

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,4 @@ dmypy.json
130130

131131
# FreeCAD related files
132132
updated_part*
133+
.DS_Store

0 commit comments

Comments
 (0)