Skip to content

Commit

Permalink
Merge pull request #496 from robbievanleeuwen/chore/format-yml
Browse files Browse the repository at this point in the history
Format yml files
  • Loading branch information
robbievanleeuwen authored Nov 27, 2024
2 parents 097f44e + c89620e commit cdd7dc3
Show file tree
Hide file tree
Showing 5 changed files with 206 additions and 195 deletions.
254 changes: 131 additions & 123 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name: CI
on:
push:
branches:
- master
- master
pull_request:
types: [opened, reopened, synchronize]

env:
UV_VERSION: "0.5.2"
DEFAULT_PYTHON_VERSION: "3.12"
UV_VERSION: 0.5.2
DEFAULT_PYTHON_VERSION: '3.12'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -21,46 +21,48 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Check out the repo
uses: actions/checkout@v4
- name: Check out the repo
uses: actions/checkout@v4

- name: Install uv version ${{ env.UV_VERSION }}
uses: astral-sh/setup-uv@v3
with:
version: ${{ env.UV_VERSION }}
enable-cache: true
- name: Install uv version ${{ env.UV_VERSION }}
uses: astral-sh/setup-uv@v3
with:
version: ${{ env.UV_VERSION }}
enable-cache: true

- name: Install python ${{ env.DEFAULT_PYTHON_VERSION }} using uv
run: uv python install ${{ env.DEFAULT_PYTHON_VERSION }}
- name: Install python ${{ env.DEFAULT_PYTHON_VERSION }} using uv
run: uv python install ${{ env.DEFAULT_PYTHON_VERSION }}

- name: Install dependencies
run: uv sync -p ${{ env.DEFAULT_PYTHON_VERSION }} --frozen --only-group lint
- name: Install dependencies
run: uv sync -p ${{ env.DEFAULT_PYTHON_VERSION }} --frozen --only-group lint

- name: Run pre-commit
run: uv run -p ${{ env.DEFAULT_PYTHON_VERSION }} --no-sync pre-commit run --all-files --color always --show-diff-on-failure
- name: Run pre-commit
run: uv run -p ${{ env.DEFAULT_PYTHON_VERSION }} --no-sync pre-commit run --all-files
--color always --show-diff-on-failure

type-checking:
name: type-checking
runs-on: ubuntu-latest

steps:
- name: Check out the repo
uses: actions/checkout@v4
- name: Check out the repo
uses: actions/checkout@v4

- name: Install uv version ${{ env.UV_VERSION }}
uses: astral-sh/setup-uv@v3
with:
version: ${{ env.UV_VERSION }}
enable-cache: true
- name: Install uv version ${{ env.UV_VERSION }}
uses: astral-sh/setup-uv@v3
with:
version: ${{ env.UV_VERSION }}
enable-cache: true

- name: Install python ${{ env.DEFAULT_PYTHON_VERSION }} using uv
run: uv python install ${{ env.DEFAULT_PYTHON_VERSION }}
- name: Install python ${{ env.DEFAULT_PYTHON_VERSION }} using uv
run: uv python install ${{ env.DEFAULT_PYTHON_VERSION }}

- name: Install dependencies
run: uv sync -p ${{ env.DEFAULT_PYTHON_VERSION }} --frozen --all-extras --no-group dev --no-group docs --no-group test
- name: Install dependencies
run: uv sync -p ${{ env.DEFAULT_PYTHON_VERSION }} --frozen --all-extras --no-group
dev --no-group docs --no-group test

- name: Run pyright
run: uv run -p ${{ env.DEFAULT_PYTHON_VERSION }} --no-sync pyright
- name: Run pyright
run: uv run -p ${{ env.DEFAULT_PYTHON_VERSION }} --no-sync pyright

tests:
name: ${{ matrix.session }} ${{ matrix.python }} [${{ matrix.os }}]
Expand All @@ -69,126 +71,132 @@ jobs:
fail-fast: false
matrix:
include:
- { python: "3.12", os: "ubuntu-latest", session: "tests" }
- { python: "3.11", os: "ubuntu-latest", session: "tests" }
- { python: "3.10", os: "ubuntu-latest", session: "tests" }
- { python: "3.12", os: "windows-latest", session: "tests" }
- { python: "3.11", os: "windows-latest", session: "tests" }
- { python: "3.10", os: "windows-latest", session: "tests" }
- { python: "3.12", os: "macos-latest", session: "tests" }
- { python: "3.11", os: "macos-latest", session: "tests" }
- { python: "3.10", os: "macos-latest", session: "tests" }
- { python: "3.12", os: "macos-13", session: "tests" }
- { python: "3.11", os: "macos-13", session: "tests" }
- { python: "3.10", os: "macos-13", session: "tests" }
- { python: "3.12", os: "ubuntu-latest", session: "tests-extended" }
- {python: '3.12', os: ubuntu-latest, session: tests}
- {python: '3.11', os: ubuntu-latest, session: tests}
- {python: '3.10', os: ubuntu-latest, session: tests}
- {python: '3.12', os: windows-latest, session: tests}
- {python: '3.11', os: windows-latest, session: tests}
- {python: '3.10', os: windows-latest, session: tests}
- {python: '3.12', os: macos-latest, session: tests}
- {python: '3.11', os: macos-latest, session: tests}
- {python: '3.10', os: macos-latest, session: tests}
- {python: '3.12', os: macos-13, session: tests}
- {python: '3.11', os: macos-13, session: tests}
- {python: '3.10', os: macos-13, session: tests}
- {python: '3.12', os: ubuntu-latest, session: tests-extended}

steps:
- name: Check out the repo
uses: actions/checkout@v4

- name: Install uv version ${{ env.UV_VERSION }}
uses: astral-sh/setup-uv@v3
with:
version: ${{ env.UV_VERSION }}
enable-cache: true

- name: Install python ${{ matrix.python }} using uv
run: uv python install ${{ matrix.python }}

- name: Install test dependencies
if: matrix.session != 'tests-extended'
run: uv sync -p ${{ matrix.python }} --frozen --extra rhino --extra dxf --no-group dev --no-group docs --no-group lint

- name: Install extended test dependencies
if: matrix.session == 'tests-extended'
run: uv sync -p ${{ matrix.python }} --frozen --all-extras --no-group dev --no-group docs --no-group lint

- name: Run pytest
run: uv run -p ${{ matrix.python }} --no-sync coverage run --parallel-mode -m pytest -m 'not benchmark_suite' --junitxml=junit.xml -o junit_family=legacy

- name: Upload coverage data
uses: actions/upload-artifact@v4
with:
name: coverage-data-${{ matrix.session }}-${{ matrix.os }}-${{ matrix.python }}
include-hidden-files: true
path: ".coverage.*"

- name: Upload test results to Codecov
if: matrix.session == 'tests-extended'
uses: codecov/test-results-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
- name: Check out the repo
uses: actions/checkout@v4

- name: Install uv version ${{ env.UV_VERSION }}
uses: astral-sh/setup-uv@v3
with:
version: ${{ env.UV_VERSION }}
enable-cache: true

- name: Install python ${{ matrix.python }} using uv
run: uv python install ${{ matrix.python }}

- name: Install test dependencies
if: matrix.session != 'tests-extended'
run: uv sync -p ${{ matrix.python }} --frozen --extra rhino --extra dxf --no-group
dev --no-group docs --no-group lint

- name: Install extended test dependencies
if: matrix.session == 'tests-extended'
run: uv sync -p ${{ matrix.python }} --frozen --all-extras --no-group dev --no-group
docs --no-group lint

- name: Run pytest
run: uv run -p ${{ matrix.python }} --no-sync coverage run --parallel-mode -m
pytest -m 'not benchmark_suite' --junitxml=junit.xml -o junit_family=legacy

- name: Upload coverage data
uses: actions/upload-artifact@v4
with:
name: coverage-data-${{ matrix.session }}-${{ matrix.os }}-${{ matrix.python
}}
include-hidden-files: true
path: .coverage.*

- name: Upload test results to Codecov
if: matrix.session == 'tests-extended'
uses: codecov/test-results-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}

docs-build:
name: docs-build
runs-on: ubuntu-latest

steps:
- name: Check out the repo
uses: actions/checkout@v4
- name: Check out the repo
uses: actions/checkout@v4

- name: Install uv version ${{ env.UV_VERSION }}
uses: astral-sh/setup-uv@v3
with:
version: ${{ env.UV_VERSION }}
enable-cache: true
- name: Install uv version ${{ env.UV_VERSION }}
uses: astral-sh/setup-uv@v3
with:
version: ${{ env.UV_VERSION }}
enable-cache: true

- name: Install python ${{ env.DEFAULT_PYTHON_VERSION }} using uv
run: uv python install ${{ env.DEFAULT_PYTHON_VERSION }}
- name: Install python ${{ env.DEFAULT_PYTHON_VERSION }} using uv
run: uv python install ${{ env.DEFAULT_PYTHON_VERSION }}

- name: Install dependencies
run: uv sync -p ${{ env.DEFAULT_PYTHON_VERSION }} --frozen --extra rhino --extra dxf --no-group dev --no-group lint --no-group test
- name: Install dependencies
run: uv sync -p ${{ env.DEFAULT_PYTHON_VERSION }} --frozen --extra rhino --extra
dxf --no-group dev --no-group lint --no-group test

- name: Install pandoc
uses: pandoc/actions/setup@v1
- name: Install pandoc
uses: pandoc/actions/setup@v1

- name: Build docs
run: uv run -p ${{ env.DEFAULT_PYTHON_VERSION }} --no-sync sphinx-build --color docs docs/_build
- name: Build docs
run: uv run -p ${{ env.DEFAULT_PYTHON_VERSION }} --no-sync sphinx-build --color
docs docs/_build

- name: Upload docs
uses: actions/upload-artifact@v4
with:
name: docs
path: docs/_build
- name: Upload docs
uses: actions/upload-artifact@v4
with:
name: docs
path: docs/_build

coverage:
name: coverage
runs-on: ubuntu-latest
needs: tests

steps:
- name: Check out the repo
uses: actions/checkout@v4
- name: Check out the repo
uses: actions/checkout@v4

- name: Install uv version ${{ env.UV_VERSION }}
uses: astral-sh/setup-uv@v3
with:
version: ${{ env.UV_VERSION }}
enable-cache: true
- name: Install uv version ${{ env.UV_VERSION }}
uses: astral-sh/setup-uv@v3
with:
version: ${{ env.UV_VERSION }}
enable-cache: true

- name: Install python ${{ env.DEFAULT_PYTHON_VERSION }} using uv
run: uv python install ${{ env.DEFAULT_PYTHON_VERSION }}
- name: Install python ${{ env.DEFAULT_PYTHON_VERSION }} using uv
run: uv python install ${{ env.DEFAULT_PYTHON_VERSION }}

- name: Install dependencies
run: uv sync -p ${{ env.DEFAULT_PYTHON_VERSION }} --frozen --only-group test
- name: Install dependencies
run: uv sync -p ${{ env.DEFAULT_PYTHON_VERSION }} --frozen --only-group test

- name: Download coverage data
uses: actions/download-artifact@v4
with:
pattern: coverage-data-*
merge-multiple: true
- name: Download coverage data
uses: actions/download-artifact@v4
with:
pattern: coverage-data-*
merge-multiple: true

- name: Combine coverage data
run: uv run -p ${{ env.DEFAULT_PYTHON_VERSION }} --no-sync coverage combine
- name: Combine coverage data
run: uv run -p ${{ env.DEFAULT_PYTHON_VERSION }} --no-sync coverage combine

- name: Display coverage report
run: uv run -p ${{ env.DEFAULT_PYTHON_VERSION }} --no-sync coverage report -i
- name: Display coverage report
run: uv run -p ${{ env.DEFAULT_PYTHON_VERSION }} --no-sync coverage report -i

- name: Create coverage report
run: uv run -p ${{ env.DEFAULT_PYTHON_VERSION }} --no-sync coverage xml -i
- name: Create coverage report
run: uv run -p ${{ env.DEFAULT_PYTHON_VERSION }} --no-sync coverage xml -i

- name: Upload coverage report
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
- name: Upload coverage report
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
12 changes: 7 additions & 5 deletions .github/workflows/greetings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ jobs:
issues: write
pull-requests: write
steps:
- uses: actions/first-interaction@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
issue-message: "Thanks for opening your first issue in ``sectionproperties`` :raised_hands: Pull requests are always welcome :wink:"
pr-message: "Thank you for your contribution to ``sectionproperties`` :pray: We will be reviewing your PR shortly :monocle_face:"
- uses: actions/first-interaction@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
issue-message: 'Thanks for opening your first issue in ``sectionproperties``
:raised_hands: Pull requests are always welcome :wink:'
pr-message: 'Thank you for your contribution to ``sectionproperties`` :pray:
We will be reviewing your PR shortly :monocle_face:'
14 changes: 7 additions & 7 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ name: Labeler
on:
push:
branches:
- master
- master

jobs:
labeler:
runs-on: ubuntu-latest
steps:
- name: Check out the repository
uses: actions/checkout@v4
- name: Check out the repository
uses: actions/checkout@v4

- name: Run Labeler
uses: crazy-max/ghaction-github-labeler@v5
with:
skip-delete: true
- name: Run Labeler
uses: crazy-max/ghaction-github-labeler@v5
with:
skip-delete: true
Loading

0 comments on commit cdd7dc3

Please sign in to comment.