From 2a572882c22de75db5ca4b3987b345608f7d3f58 Mon Sep 17 00:00:00 2001 From: Kyle Barron Date: Thu, 22 Aug 2024 10:56:26 -0400 Subject: [PATCH] update ci (#38) * update ci * simplify config * comment out pre-commit for now --- .github/workflows/build-wheels.yml | 30 +++++++++++++++--------------- .github/workflows/ci.yml | 19 ++++++++++--------- .pre-commit-config.yaml | 7 +------ 3 files changed, 26 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index 7ee44ec..d9fdedf 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -4,7 +4,7 @@ name: Build Wheels on: push: tags: - - 'v*' + - "v*" jobs: build_wheels: @@ -15,21 +15,21 @@ jobs: os: [ubuntu-latest, macos-11] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: Build wheels - uses: pypa/cibuildwheel@v2.11.2 - env: - # From rio-color here: - # https://github.com/mapbox/rio-color/blob/0ab59ad8e2db99ad1d0c8bd8c2e4cf8d0c3114cf/appveyor.yml#L3 - CIBW_SKIP: "cp2* cp35* pp* *-win32 *-manylinux_i686" - CIBW_ARCHS_MACOS: x86_64 arm64 - CIBW_BEFORE_BUILD_MACOS: brew install glm - CIBW_BEFORE_ALL_LINUX: curl -sL https://github.com/g-truc/glm/releases/download/0.9.9.8/glm-0.9.9.8.zip > glm.zip && unzip -q glm.zip && cp -r glm/glm/ /usr/include/ + - name: Build wheels + uses: pypa/cibuildwheel@v2.11.2 + env: + # From rio-color here: + # https://github.com/mapbox/rio-color/blob/0ab59ad8e2db99ad1d0c8bd8c2e4cf8d0c3114cf/appveyor.yml#L3 + CIBW_SKIP: "cp2* cp35* pp* *-win32 *-manylinux_i686" + CIBW_ARCHS_MACOS: x86_64 arm64 + CIBW_BEFORE_BUILD_MACOS: brew install glm + CIBW_BEFORE_ALL_LINUX: curl -sL https://github.com/g-truc/glm/releases/download/0.9.9.8/glm-0.9.9.8.zip > glm.zip && unzip -q glm.zip && cp -r glm/glm/ /usr/include/ - - uses: actions/upload-artifact@v2 - with: - path: ./wheelhouse/*.whl + - uses: actions/upload-artifact@v2 + with: + path: ./wheelhouse/*.whl build_sdist: name: Build source distribution @@ -40,7 +40,7 @@ jobs: - uses: actions/setup-python@v2 name: Install Python with: - python-version: '3.7' + python-version: "3.11" - name: Build sdist run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c0ce3b..153b448 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,9 +4,9 @@ name: CI on: push: branches: - - master + - master tags: - - '*' + - "*" pull_request: jobs: @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.9] steps: - uses: actions/checkout@v2 @@ -34,9 +34,10 @@ jobs: # - name: Run tests # run: pytest - # Run pre-commit (only for python-3.8) - - name: run pre-commit - if: matrix.python-version == 3.8 - run: | - python -m pip install pre-commit - pre-commit run --all-files + # TODO: re-enable pre-commit + # # Run pre-commit (only for python-3.9) + # - name: run pre-commit + # if: matrix.python-version == 3.9 + # run: | + # python -m pip install pre-commit + # pre-commit run --all-files diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c81b9d5..4216e79 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,16 +20,12 @@ repos: rev: 5.4.2 hooks: - id: isort - language_version: python3.8 - repo: https://github.com/psf/black rev: 22.10.0 hooks: - id: black - args: - [ - "--skip-string-normalization", - ] + args: ["--skip-string-normalization"] language_version: python3 - repo: https://github.com/PyCQA/pylint @@ -41,5 +37,4 @@ repos: rev: v0.812 hooks: - id: mypy - language_version: python3.8 args: ["--ignore-missing-imports"]