From 6a050ef4e60dc24eb22b304df6405c27d1a63f99 Mon Sep 17 00:00:00 2001 From: Mikhail Koviazin Date: Fri, 19 Jul 2024 11:26:39 +0100 Subject: [PATCH 1/2] github: format files using yamlfmt Signed-off-by: Mikhail Koviazin --- .github/spellcheck-settings.yml | 56 ++++---- .github/workflows/REUSABLE-wheeler.yaml | 162 +++++++++++----------- .github/workflows/freebsd.yaml | 54 ++++---- .github/workflows/integration.yaml | 62 ++++----- .github/workflows/pypi-publish.yaml | 2 +- .github/workflows/release-drafter.yml | 6 +- .github/workflows/wheelbuild-labeled.yaml | 2 +- 7 files changed, 172 insertions(+), 172 deletions(-) diff --git a/.github/spellcheck-settings.yml b/.github/spellcheck-settings.yml index b8ca6cc..6a08204 100644 --- a/.github/spellcheck-settings.yml +++ b/.github/spellcheck-settings.yml @@ -1,29 +1,29 @@ matrix: -- name: Markdown - expect_match: false - apsell: - lang: en - d: en_US - ignore-case: true - dictionary: - wordlists: - - .github/wordlist.txt - output: wordlist.dic - pipeline: - - pyspelling.filters.markdown: - markdown_extensions: - - markdown.extensions.extra: - - pyspelling.filters.html: - comments: false - attributes: - - alt - ignores: - - ':matches(code, pre)' - - code - - pre - - blockquote - - img - sources: - - 'README.md' - - 'FAQ.md' - - 'docs/**' + - name: Markdown + expect_match: false + apsell: + lang: en + d: en_US + ignore-case: true + dictionary: + wordlists: + - .github/wordlist.txt + output: wordlist.dic + pipeline: + - pyspelling.filters.markdown: + markdown_extensions: + - markdown.extensions.extra: + - pyspelling.filters.html: + comments: false + attributes: + - alt + ignores: + - ':matches(code, pre)' + - code + - pre + - blockquote + - img + sources: + - 'README.md' + - 'FAQ.md' + - 'docs/**' diff --git a/.github/workflows/REUSABLE-wheeler.yaml b/.github/workflows/REUSABLE-wheeler.yaml index 2d20811..cd3ddb7 100644 --- a/.github/workflows/REUSABLE-wheeler.yaml +++ b/.github/workflows/REUSABLE-wheeler.yaml @@ -12,97 +12,97 @@ on: permissions: - contents: read # to fetch code (actions/checkout) + contents: read # to fetch code (actions/checkout) jobs: - build_wheels: - name: Build wheels on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-20.04, windows-2019, macos-latest] - env: - CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" - MACOSX_DEPLOYMENT_TARGET: "10.15" - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive + build_wheels: + name: Build wheels on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-20.04, windows-2019, macos-latest] + env: + CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" + MACOSX_DEPLOYMENT_TARGET: "10.15" + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive - - name: Set up QEMU - if: runner.os == 'Linux' - uses: docker/setup-qemu-action@v3 - with: - platforms: all + - name: Set up QEMU + if: runner.os == 'Linux' + uses: docker/setup-qemu-action@v3 + with: + platforms: all - - name: Build wheels - uses: pypa/cibuildwheel@v2.19.2 - env: - # configure cibuildwheel to build native archs ('auto'), and some - # emulated ones - CIBW_ARCHS_LINUX: auto aarch64 ppc64le s390x + - name: Build wheels + uses: pypa/cibuildwheel@v2.19.2 + env: + # configure cibuildwheel to build native archs ('auto'), and some + # emulated ones + CIBW_ARCHS_LINUX: auto aarch64 ppc64le s390x - - uses: actions/upload-artifact@v3 - with: - name: ${{matrix.os}}-wheels - path: ./wheelhouse/*.whl + - uses: actions/upload-artifact@v3 + with: + name: ${{matrix.os}}-wheels + path: ./wheelhouse/*.whl - build_sdist: - name: Build source dist - runs-on: ubuntu-20.04 - steps: - - uses: actions/setup-python@v4 - with: - python-version: '3.10' - - uses: actions/checkout@v3 - with: - submodules: recursive - - name: Build sdist - run: | - python3 setup.py sdist - - uses: actions/upload-artifact@v3 - with: - name: source-dist - path: ./dist/*.tar.gz + build_sdist: + name: Build source dist + runs-on: ubuntu-20.04 + steps: + - uses: actions/setup-python@v4 + with: + python-version: '3.10' + - uses: actions/checkout@v3 + with: + submodules: recursive + - name: Build sdist + run: | + python3 setup.py sdist + - uses: actions/upload-artifact@v3 + with: + name: source-dist + path: ./dist/*.tar.gz - publish: - name: Pypi publish - if: ${{inputs.release == true}} - needs: ['build_wheels', 'build_sdist'] - runs-on: ubuntu-latest - environment: pypi - permissions: - id-token: write - steps: - - uses: actions/setup-python@v5 - with: - python-version: 3.9 - - name: Install tools - run: | - pip install twine wheel - - uses: actions/download-artifact@v3 - with: - name: ubuntu-20.04-wheels - path: artifacts/linux - - uses: actions/download-artifact@v3 - with: - name: windows-2019-wheels - path: artifacts/windows - - uses: actions/download-artifact@v3 - with: - name: macos-latest-wheels - path: artifacts/macos - - uses: actions/download-artifact@v3 - with: - name: source-dist - path: artifacts/sdist - - name: unify wheel structure - run: | + publish: + name: Pypi publish + if: ${{inputs.release == true}} + needs: ['build_wheels', 'build_sdist'] + runs-on: ubuntu-latest + environment: pypi + permissions: + id-token: write + steps: + - uses: actions/setup-python@v5 + with: + python-version: 3.9 + - name: Install tools + run: | + pip install twine wheel + - uses: actions/download-artifact@v3 + with: + name: ubuntu-20.04-wheels + path: artifacts/linux + - uses: actions/download-artifact@v3 + with: + name: windows-2019-wheels + path: artifacts/windows + - uses: actions/download-artifact@v3 + with: + name: macos-latest-wheels + path: artifacts/macos + - uses: actions/download-artifact@v3 + with: + name: source-dist + path: artifacts/sdist + - name: unify wheel structure + run: | mkdir dist cp -R artifacts/windows/* dist cp -R artifacts/linux/* dist cp -R artifacts/macos/* dist cp -R artifacts/sdist/* dist - - name: Publish to Pypi - uses: pypa/gh-action-pypi-publish@release/v1 + - name: Publish to Pypi + uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/.github/workflows/freebsd.yaml b/.github/workflows/freebsd.yaml index f92d61e..fc302c8 100644 --- a/.github/workflows/freebsd.yaml +++ b/.github/workflows/freebsd.yaml @@ -15,33 +15,33 @@ on: - '[0-9].[0-9]' permissions: - contents: read # to fetch code (actions/checkout) + contents: read # to fetch code (actions/checkout) jobs: - run-tests: - runs-on: ubuntu-latest - timeout-minutes: 30 - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - name: Python ${{ matrix.python-version }} FreeBSD - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - - name: build and test - uses: vmactions/freebsd-vm@v1 - with: - envs: 'ACTIONS_ALLOW_UNSECURE_COMMANDS' - usesh: true - sync: rsync - copyback: false - prepare: pkg install -y bash curl python39 - run: | - curl -s https://bootstrap.pypa.io/get-pip.py -o get-pip.py - python3.9 get-pip.py - /usr/local/bin/pip install -U pip setuptools wheel - /usr/local/bin/pip install -r dev_requirements.txt - /usr/local/bin/python3.9 setup.py build_ext --inplace - python -m pytest - python3.9 setup.py bdist_wheel + run-tests: + runs-on: ubuntu-latest + timeout-minutes: 30 + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: true + name: Python ${{ matrix.python-version }} FreeBSD + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + - name: build and test + uses: vmactions/freebsd-vm@v1 + with: + envs: 'ACTIONS_ALLOW_UNSECURE_COMMANDS' + usesh: true + sync: rsync + copyback: false + prepare: pkg install -y bash curl python39 + run: | + curl -s https://bootstrap.pypa.io/get-pip.py -o get-pip.py + python3.9 get-pip.py + /usr/local/bin/pip install -U pip setuptools wheel + /usr/local/bin/pip install -r dev_requirements.txt + /usr/local/bin/python3.9 setup.py build_ext --inplace + python -m pytest + python3.9 setup.py bdist_wheel diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 40a1f6e..1947ecd 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -15,37 +15,37 @@ on: - '[0-9].[0-9]' permissions: - contents: read # to fetch code (actions/checkout) + contents: read # to fetch code (actions/checkout) jobs: - run-tests: - runs-on: ${{matrix.os}} - timeout-minutes: 30 - strategy: - max-parallel: 15 - matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.8', 'pypy-3.9'] - os: ['ubuntu-latest', 'windows-latest', 'macos-latest'] - fail-fast: false - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - name: Python ${{ matrix.python-version }} ${{matrix.os}} - steps: - - uses: actions/checkout@v3 - with: - submodules: recursive - - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - cache: 'pip' - cache-dependency-path: dev_requirements.txt - - name: run tests - run: | - pip install -U pip setuptools wheel - pip install -r dev_requirements.txt - python setup.py build_ext --inplace - python -m pytest - - name: build and install the wheel - run: | - python setup.py bdist_wheel + run-tests: + runs-on: ${{matrix.os}} + timeout-minutes: 30 + strategy: + max-parallel: 15 + matrix: + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.8', 'pypy-3.9'] + os: ['ubuntu-latest', 'windows-latest', 'macos-latest'] + fail-fast: false + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: true + name: Python ${{ matrix.python-version }} ${{matrix.os}} + steps: + - uses: actions/checkout@v3 + with: + submodules: recursive + - uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' + cache-dependency-path: dev_requirements.txt + - name: run tests + run: | + pip install -U pip setuptools wheel + pip install -r dev_requirements.txt + python setup.py build_ext --inplace + python -m pytest + - name: build and install the wheel + run: | + python setup.py bdist_wheel diff --git a/.github/workflows/pypi-publish.yaml b/.github/workflows/pypi-publish.yaml index d072021..3b5b3fc 100644 --- a/.github/workflows/pypi-publish.yaml +++ b/.github/workflows/pypi-publish.yaml @@ -5,7 +5,7 @@ on: tags: - 'v[0-9]+.[0-9]+.[0-9]+' permissions: - contents: read # to fetch code (actions/checkout) + contents: read # to fetch code (actions/checkout) jobs: diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 9008623..7f73ec5 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -9,8 +9,8 @@ on: jobs: update_release_draft: permissions: - pull-requests: write # to add label to PR (release-drafter/release-drafter) - contents: write # to create a github release (release-drafter/release-drafter) + pull-requests: write # to add label to PR (release-drafter/release-drafter) + contents: write # to create a github release (release-drafter/release-drafter) runs-on: ubuntu-latest steps: @@ -18,6 +18,6 @@ jobs: - uses: release-drafter/release-drafter@v5 with: # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml - config-name: release-drafter-config.yml + config-name: release-drafter-config.yml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/wheelbuild-labeled.yaml b/.github/workflows/wheelbuild-labeled.yaml index b22748e..862e4ee 100644 --- a/.github/workflows/wheelbuild-labeled.yaml +++ b/.github/workflows/wheelbuild-labeled.yaml @@ -6,7 +6,7 @@ on: - labeled permissions: - contents: read # to fetch code (actions/checkout) + contents: read # to fetch code (actions/checkout) jobs: From 0feafc2c75ca689ee74403de844ff575efb67401 Mon Sep 17 00:00:00 2001 From: Mikhail Koviazin Date: Fri, 19 Jul 2024 11:30:56 +0100 Subject: [PATCH 2/2] Added `.git-blame-ignore-revs` It will be used to store the revisions that need to be ignored during `git blame`. The user should configure it themselves, the instructions are left in the file itself. Signed-off-by: Mikhail Koviazin --- .git-blame-ignore-revs | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..a76a6bb --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,11 @@ +# This is a file that can be used by git-blame to ignore some revisions. +# (git 2.23+, released in August 2019) +# +# Can be configured as follow: +# +# $ git config blame.ignoreRevsFile .git-blame-ignore-revs +# +# For more information you can look at git-blame(1) man page. + +# Reformat yaml files +6a050ef4e60dc24eb22b304df6405c27d1a63f99