From 536570e0ac060acc843af48fc795823c0e39e4b3 Mon Sep 17 00:00:00 2001 From: Markus Binsteiner Date: Sat, 20 Apr 2024 13:37:38 +0200 Subject: [PATCH] ci: improve and update github actions --- .github/workflows/build-darwin.yaml | 8 ++++---- .github/workflows/build-linux.yaml | 8 ++------ .github/workflows/build-windows.yaml | 8 ++++---- ci/conda/conda-pkg-patch.yaml | 4 ++-- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-darwin.yaml b/.github/workflows/build-darwin.yaml index 51722e8ea..20e83be81 100644 --- a/.github/workflows/build-darwin.yaml +++ b/.github/workflows/build-darwin.yaml @@ -12,19 +12,19 @@ jobs: runs-on: macos-11 strategy: matrix: - python_version: ["3.8", "3.9", "3.10", "3.11"] + python_version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - name: "Set up Python ${{ matrix.python_version }}" - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: "${{ matrix.python_version }}" - name: pip cache id: pip-cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.*') }} - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: install core_types plugin run: pip install -U git+https://github.com/DHARPA-project/kiara_plugin.core_types@develop - name: install tabular types plugin diff --git a/.github/workflows/build-linux.yaml b/.github/workflows/build-linux.yaml index db2f4b56c..8cf45b054 100644 --- a/.github/workflows/build-linux.yaml +++ b/.github/workflows/build-linux.yaml @@ -125,10 +125,6 @@ jobs: build_python_package: name: build python package runs-on: ubuntu-latest - needs: - - test-linux - - mypy-linux - - linting-linux steps: - name: Set up Python 3.12 uses: actions/setup-python@v5 @@ -192,7 +188,7 @@ jobs: with: fetch-depth: 0 - name: install kiara_plugin.develop - run: pip install kiara_plugin.develop + run: pip install -U git+https://github.com/DHARPA-project/kiara_plugin.core_types@develop - name: build conda package run: kiara build conda pkg --channel dharpa --channel conda-forge --patch-data ci/conda/conda-pkg-patch.yaml --output-folder build-dir . - name: upload artifacts @@ -223,7 +219,7 @@ jobs: path: ~/.cache/pip key: ${{ runner.os }}-pip-3.12 - name: install kiara_plugin.develop - run: pip install kiara_plugin.develop + run: pip install -U git+https://github.com/DHARPA-project/kiara_plugin.core_types@develop - name: Retrieve build distributions uses: actions/download-artifact@v4 with: diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml index b8336b3db..0c5628978 100644 --- a/.github/workflows/build-windows.yaml +++ b/.github/workflows/build-windows.yaml @@ -9,19 +9,19 @@ jobs: runs-on: windows-latest strategy: matrix: - python_version: ["3.8", "3.9", "3.10", "3.11"] + python_version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - name: "Set up Python ${{ matrix.python_version }}" - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: "${{ matrix.python_version }}" - name: pip cache id: pip-cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.*') }} - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: install core_types plugin run: pip install -U git+https://github.com/DHARPA-project/kiara_plugin.core_types@develop - name: install tabular types plugin diff --git a/ci/conda/conda-pkg-patch.yaml b/ci/conda/conda-pkg-patch.yaml index dcc899d9e..21cbd4ecf 100644 --- a/ci/conda/conda-pkg-patch.yaml +++ b/ci/conda/conda-pkg-patch.yaml @@ -4,8 +4,8 @@ requirements: docstring-parser: docstring_parser channels: - - conda-forge - dharpa + - conda-forge entry_points: kiara: kiara.interfaces.cli:cli @@ -13,7 +13,7 @@ entry_points: host_requirements: - pip - python - - setuptools<=63 + - setuptools - setuptools_scm - setuptools_scm_git_archive