From 41191cd61515853ebe08c34ca3e23af79cbae016 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Wed, 11 Jan 2023 17:23:01 -0500 Subject: [PATCH] [ci/python] Don't build wheels on each PR push (#697) * [ci/python] Don't build wheels on each PR push * File-renames I thought I had done on #694 * code-review feedback * more * neaten --- .github/workflows/{ci.yml => python-ci.yml} | 1 + .../workflows/{format.yml => python-cpp-format.yml} | 5 +++++ .../{py-packaging.yaml => python-packaging.yml} | 12 ++++++------ apis/python/README.md | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) rename .github/workflows/{ci.yml => python-ci.yml} (97%) rename .github/workflows/{format.yml => python-cpp-format.yml} (82%) rename .github/workflows/{py-packaging.yaml => python-packaging.yml} (93%) diff --git a/.github/workflows/ci.yml b/.github/workflows/python-ci.yml similarity index 97% rename from .github/workflows/ci.yml rename to .github/workflows/python-ci.yml index 7ad94d9659..ab5a6c944b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/python-ci.yml @@ -85,6 +85,7 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} fail_ci_if_error: true + # TODO: merge with python-packaging.yml -- https://github.com/single-cell-data/TileDB-SOMA/issues/700 - name: Build wheel distribution run: python -m pip -v wheel --no-deps --wheel-dir=dist-wheel apis/python env: diff --git a/.github/workflows/format.yml b/.github/workflows/python-cpp-format.yml similarity index 82% rename from .github/workflows/format.yml rename to .github/workflows/python-cpp-format.yml index 18f3d2198f..726ec0c5d6 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/python-cpp-format.yml @@ -27,3 +27,8 @@ jobs: # python -m pip install mypy types-setuptools typeguard python -m pip install mypy==0.982 types-setuptools 'attrs>=22.1' python -m mypy . + + - name: Check C++ Format + run: | + ./scripts/run-clang-format.sh . clang-format 0 \ + $(find libtiledbsoma -name "*.cc" -or -name "*.h") diff --git a/.github/workflows/py-packaging.yaml b/.github/workflows/python-packaging.yml similarity index 93% rename from .github/workflows/py-packaging.yaml rename to .github/workflows/python-packaging.yml index 26b9134128..18c31bb7d7 100644 --- a/.github/workflows/py-packaging.yaml +++ b/.github/workflows/python-packaging.yml @@ -1,14 +1,13 @@ name: TileDB-SOMA python sdist & wheels on: - # Normally the smoke test only runs on merge to main. To run it on a PR CI, comment out - # `workflow_dispatch:` and uncomment `pull_request:`. + # I.e. on request workflow_dispatch: + # Normally the smoke test only runs on merge to main. To run it on a PR CI, uncomment `pull_request:` # pull_request: - push: - branches: [main] - paths-ignore: - - 'apis/r/**' + # branches: [main] + # paths-ignore: + # - 'apis/r/**' release: types: [published] @@ -30,6 +29,7 @@ jobs: name: sdist path: apis/python/dist/ + # TODO: merge with python-packaging.yml -- https://github.com/single-cell-data/TileDB-SOMA/issues/700 wheels: # Note: tries all supported Python versions as specified in apis/python/setup.py name: Build wheels on ${{ matrix.os }} diff --git a/apis/python/README.md b/apis/python/README.md index c926aa78e5..405e318f81 100644 --- a/apis/python/README.md +++ b/apis/python/README.md @@ -1,6 +1,6 @@ # Overview -This is a POC Python implementation of the proposed [Unified Single-cell Data Model](https://github.com/single-cell-data/SOMA). +This is a Python implementation of the [Unified Single-cell Data Model](https://github.com/single-cell-data/SOMA). This branch, `main`, implements the [updated specfication](https://github.com/single-cell-data/SOMA/blob/main/abstract_specification.md). Please also see the `main-old` branch which implements the [original specification](https://github.com/single-cell-data/TileDB-SOMA/blob/main-old/spec/specification.md).