Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ on:
jobs:
run-black-lint:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: ["3.10"]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v6
- name: Set up Python
uses: actions/setup-python@v6
with:
python-version: "3.13"
- name: Install CadQuery and pytest
shell: bash --login {0}
run: |
pip install --upgrade pip
pip install -e .
pip install -e .[dev]
python -m pip install --upgrade pip
python -m pip install -e .
python -m pip install -e .[dev]
- name: Run tests
shell: bash --login {0}
run: |
black --diff --check .
black --diff --check --target-version py313 --extend-exclude 'tests/testdata/syntax_error.py' .
24 changes: 12 additions & 12 deletions .github/workflows/pyinstaller-builds-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
build-linux:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
- uses: actions/checkout@v6
- uses: conda-incubator/setup-miniconda@v3
with:
# miniconda-version: "latest"
miniforge-version: latest
auto-update-conda: true
python-version: 3.8
python-version: 3.11
activate-environment: test
- name: Install CadQuery and pyinstaller
shell: bash --login {0}
Expand All @@ -32,19 +32,19 @@ jobs:
run: |
mamba info
pyinstaller cq-cli_pyinstaller.spec ${{ github.event.inputs.type }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v7
with:
name: cq-cli-Linux-x86_64
path: dist
build-macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
- uses: actions/checkout@v6
- uses: conda-incubator/setup-miniconda@v3
with:
miniconda-version: "latest"
auto-update-conda: true
python-version: 3.8
python-version: 3.11
activate-environment: test
- name: Install CadQuery and pyinstaller
shell: bash --login {0}
Expand All @@ -58,19 +58,19 @@ jobs:
run: |
conda info
pyinstaller cq-cli_pyinstaller.spec ${{ github.event.inputs.type }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v7
with:
name: cq-cli-MacOS
path: dist
build-windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
- uses: actions/checkout@v6
- uses: conda-incubator/setup-miniconda@v3
with:
miniforge-version: latest
# auto-update-conda: true
python-version: 3.8
python-version: 3.11
activate-environment: test
- name: Install CadQuery and pyinstaller
shell: pwsh
Expand All @@ -86,7 +86,7 @@ jobs:
Get-ChildItem -Path C:\Miniconda3\envs\test\ -Filter OCP* -Recurse
mamba info
pyinstaller cq-cli_pyinstaller.spec ${{ github.event.inputs.type }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v7
with:
name: cq-cli-Windows
path: dist
24 changes: 12 additions & 12 deletions .github/workflows/pyinstaller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
build-linux:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v4
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
with:
python-version: '3.10'
python-version: '3.11'
- name: Install dependencies
run: |
pip install --upgrade pip
Expand All @@ -24,17 +24,17 @@ jobs:
- name: Run PyInstaller build
run: |
pyinstaller pyinstaller.spec ${{ github.event.inputs.type }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v7
with:
name: cq-cli-Linux-x86_64
path: dist
build-macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v4
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
with:
python-version: '3.10'
python-version: '3.11'
- name: Install dependencies
run: |
pip install --upgrade pip
Expand All @@ -45,17 +45,17 @@ jobs:
- name: Run PyInstaller build
run: |
pyinstaller pyinstaller.spec ${{ github.event.inputs.type }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v7
with:
name: cq-cli-MacOS
path: dist
build-windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v4
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
with:
python-version: '3.10'
python-version: '3.11'
- name: Install dependencies
run: |
pip install --upgrade pip
Expand All @@ -69,7 +69,7 @@ jobs:
# CPATH=$pythonLocation/include/python${{ matrix.python-version }}m
# echo "CPATH=$CPATH" >> $GITHUB_ENV
pyinstaller pyinstaller.spec ${{ github.event.inputs.type }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v7
with:
name: cq-cli-Windows
path: dist
2 changes: 1 addition & 1 deletion .github/workflows/test_freecad.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout project
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Install and Test
run: |
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,23 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.10"]
python-version: ["3.11"]
os: [ubuntu-22.04] # windows-latest , macos-latest
runs-on: ${{ matrix.os }}
steps:
- name: Install Dependencies (Linux)
run: sudo apt-get update && sudo apt install -y libgl1-mesa-glx
if: matrix.os == 'ubuntu-20.04'
- uses: actions/checkout@v2
if: matrix.os == 'ubuntu-22.04'
- uses: actions/checkout@v6
- name: Set up Python
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: Install CadQuery and pytest
run: |
pip3 install --upgrade pip
pip3 install -e .
pip3 install -e .[dev]
python -m pip install --upgrade pip
python -m pip install -e .
python -m pip install -e .[dev]
- name: Run tests
run: |
python3 -m pytest -v --ignore=tests/test_freecad.py
python -m pytest -v --ignore=tests/test_freecad.py
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,4 @@ dmypy.json

# FreeCAD related files
updated_part*
.DS_Store
Loading