Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ updates:
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
12 changes: 6 additions & 6 deletions .github/workflows/cpp-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
steps:
- uses: actions/checkout@v7

- name: Install prebuilt Protobuf
- name: Install Protobuf
uses: mamba-org/setup-micromamba@v2
with:
environment-name: calf-ci
Expand All @@ -63,15 +63,15 @@ jobs:
-DCALF_PYTHON_TESTS=OFF \
-DCALF_PROTOBUF_FETCH=OFF

- name: Verify prebuilt Protobuf
- name: Verify Protobuf
shell: bash
run: test ! -d "${GITHUB_WORKSPACE}/build/_deps/protobuf-src"

- name: Build
shell: bash -el {0}
run: cmake --build "${GITHUB_WORKSPACE}/build" --parallel

- name: Run C++ tests
- name: Run tests
shell: bash -el {0}
working-directory: build
run: ctest --output-on-failure
Expand All @@ -87,7 +87,7 @@ jobs:
steps:
- uses: actions/checkout@v7

- name: Install prebuilt Protobuf
- name: Install Protobuf
uses: mamba-org/setup-micromamba@v2
with:
environment-name: calf-ci
Expand All @@ -110,15 +110,15 @@ jobs:
-DCALF_PYTHON_TESTS=OFF \
-DCALF_PROTOBUF_FETCH=OFF

- name: Verify prebuilt Protobuf
- name: Verify Protobuf
shell: bash
run: test ! -d "${GITHUB_WORKSPACE}/build/_deps/protobuf-src"

- name: Build
shell: bash -el {0}
run: cmake --build "${GITHUB_WORKSPACE}/build" --parallel

- name: Run C++ tests
- name: Run tests
shell: bash -el {0}
working-directory: build
run: ctest --output-on-failure
2 changes: 1 addition & 1 deletion .github/workflows/python-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
if: startsWith(matrix.os, 'macos-')
run: brew install cmake ninja

- name: Build and install capio-calf with PyPI Protobuf
- name: Build wheels
run: python -m pip install ".[test]"

- name: Run Python tests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release Python Wheels
name: Release New Version

on:
workflow_run:
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
if-no-files-found: error

sdist:
name: Source distribution
name: Sdist
needs: release-version
if: needs.release-version.outputs.should_publish == 'true'
runs-on: ubuntu-24.04
Expand Down
17 changes: 10 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[build-system]
requires = [
"scikit-build-core[pyproject]==0.11.6",
"scikit-build-core[pyproject]==1.0.3",
"dynamic-metadata==0.5.0",
"pybind11==3.0.1",
"setuptools==80.9.0",
"wheel==0.45.1",
Expand All @@ -9,18 +10,14 @@ build-backend = "scikit_build_core.build"

[project]
name = "capio-calf"
dynamic = ["version"]
dynamic = ["version", "dependencies"]
description = "CAPIO Logging Facility and interactive trace inspector"
readme = "README.md"
license = { file = "LICENSE" }
requires-python = ">=3.10"
authors = [
{ name = "Marco Edoardo Santimaria", email = "marcoedoardo.santimaria@unito.it" },
]
dependencies = [
"numpy>=1.24.0",
"protobuf>=6.31.1,<7",
]

[project.optional-dependencies]
test = ["pytest>=8.0"]
Expand Down Expand Up @@ -48,8 +45,14 @@ wheel.exclude = [
CALF_BUILD_PYTHON_BINDINGS = true
CALF_PROTOBUF = false

[tool.scikit-build.metadata.version]
[[tool.dynamic-metadata]]
provider = "scikit_build_core.metadata.regex"
field = "version"
input = "CMakeLists.txt"
regex = "(?m)VERSION\\s+(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
result = "{major}.{minor}.{patch}"

[[tool.dynamic-metadata]]
provider = "dynamic_metadata.from_file"
field = "dependencies"
path = "requirements.txt"
2 changes: 2 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
numpy>=1.24.0
protobuf>=6.31.1,<7
Loading