diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..614d261b2 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,111 @@ +name: Build + +on: + push: + pull_request: + branches: + - master + release: + types: + - created + # schedule: + # - cron: "0 7 * * 1" + +jobs: + test: + runs-on: ubuntu-latest + strategy: + matrix: + python: ["3.7", "3.8", "3.9", "3.10", "3.11"] + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python }} + - name: Install tox + run: | + pip install --upgrade pip + pip install tox tox-gh-actions + - name: Run tox + env: + PYTEST_ADDOPTS: "--durations=0 -vv" + run: | + tox + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: "3.11" + - uses: nikeee/setup-pandoc@v1 + - name: Install tox + run: | + pip install --upgrade pip + pip install tox + - name: Run tox for lint and docs + run: | + tox -e flake8,docs + - uses: actions/upload-artifact@v3 + with: + name: docs + path: ./docs/_build + build_wheels: + name: Build wheels on ${{ matrix.buildplat[0] }} / ${{ matrix.buildplat[1] }} for ${{ matrix.python }} + runs-on: ${{ matrix.buildplat[0] }} + strategy: + matrix: + buildplat: + - [ubuntu-latest, manylinux_x86_64] + - [ubuntu-latest, musllinux_x86_64] + - [macos-latest, macosx_*] + - [windows-latest, win_amd64] + python: ["cp37", "cp38", "cp39", "cp310", "cp311"] + exclude: + - buildplat: + - [windows-latest, win32] + fail-fast: false + + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - run: git status && git tag --list && pwd + - uses: actions/setup-python@v4 + with: + python-version: "3.x" + + - name: Build wheels + uses: pypa/cibuildwheel@v2.14.1 + env: + CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }} + + - uses: actions/upload-artifact@v3 + with: + name: ${{ matrix.python }}-${{ startsWith(matrix.buildplat[1], 'macosx') && 'macosx' || matrix.buildplat[1] }} + path: ./wheelhouse/*.whl + + # Still on Circle-CI + # - docker + # - publish-docker + # - docs-deploy + + release: + runs-on: ubuntu-latest + needs: + - test + - lint + - build_wheels + if: github.repository == 'DigitalSlideArchive/HistomicsTK' && ( startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master' ) + environment: + name: pypi + url: https://pypi.org/p/histomicstk + permissions: + id-token: write + steps: + - uses: actions/download-artifact@v3 + with: + name: artifact + path: dist + - uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/CMakeLists.txt b/CMakeLists.txt index fb8403ce3..ab0c7a227 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.6.2) project(histomicstk) find_package(PythonInterp REQUIRED) -find_package(PythonLibs REQUIRED) find_package(PythonExtensions REQUIRED) add_subdirectory(histomicstk/features) diff --git a/setup.py b/setup.py index e97925bf8..1c3cd77f0 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ def prerelease_local_scheme(version): """ from setuptools_scm.version import get_local_node_and_date - if os.getenv('CIRCLE_BRANCH') in {'master'}: + if os.getenv('CIRCLE_BRANCH') in {'master'} or os.getenv('CI_BRANCH') in {'master'}: return '' else: return get_local_node_and_date(version) diff --git a/tox.ini b/tox.ini index 0a0238e6e..7d62c8e75 100644 --- a/tox.ini +++ b/tox.ini @@ -10,6 +10,7 @@ toxworkdir = {toxinidir}/.tox passenv = DOCKER_* GENERATE_GROUNDTRUTH + PYTEST_* # This adds the tests directory to the python path so we can import the test # utilities as needed. setenv = @@ -138,3 +139,11 @@ parallel = True [coverage:xml] output = .tox/coverage/py_coverage.xml + +[gh-actions] +python = + 3.7: py37 + 3.8: py38 + 3.9: py39 + 3.10: py310 + 3.11: py311