Skip to content

Commit d0ab9cc

Browse files
committed
Reenable python venv cache
1 parent 991c977 commit d0ab9cc

File tree

5 files changed

+2142
-19
lines changed

5 files changed

+2142
-19
lines changed

.github/workflows/ci.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ jobs:
5959
run: |
6060
make submodules
6161
62-
# - name: Cache python venv
63-
# id: cache-python
64-
# uses: actions/cache@v4
65-
# with:
66-
# path: fprime-venv
67-
# key: python-venv-${{ runner.os }}-${{ hashFiles('requirements.txt') }}-v3
68-
# restore-keys: |
69-
# python-venv-${{ runner.os }}-
70-
# python-venv-
62+
- name: Cache python venv
63+
id: cache-python
64+
uses: actions/cache@v4
65+
with:
66+
path: fprime-venv
67+
key: python-venv-${{ runner.os }}-${{ hashFiles('uv.lock') }}-v3
68+
restore-keys: |
69+
python-venv-${{ runner.os }}-
70+
python-venv-
7171
7272
- name: Setup python venv
7373
if: steps.cache-python.outputs.cache-hit != 'true'

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fprime-venv: ## Create a virtual environment
1717
@$(MAKE) uv
1818
@echo "Creating virtual environment..."
1919
@$(UV) venv fprime-venv
20-
@$(UV) pip install --requirement requirements.txt
20+
@$(UV) pip install --requirement pyproject.toml
2121

2222
.PHONY: zephyr-setup
2323
zephyr-setup: fprime-venv ## Set up Zephyr environment

pyproject.toml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[build-system]
2+
requires = ["setuptools>=80.9.0", "wheel"]
3+
build-backend = "setuptools.build_meta"
4+
5+
[project]
6+
name = "proves-core-reference"
7+
version = "0.1.0"
8+
description = "A reference software implementation for the PROVES Kit, integrating F Prime and Zephyr"
9+
readme = "README.md"
10+
license = {file = "LICENSE"}
11+
requires-python = ">=3.13"
12+
authors = [
13+
{name = "Open Source Space Foundation"},
14+
]
15+
keywords = ["fprime", "zephyr", "embedded", "aerospace", "flight-software"]
16+
17+
dynamic = ["dependencies"]
18+
19+
[project.urls]
20+
Homepage = "https://www.opensource.space/"
21+
Repository = "https://github.com/Open-Source-Space-Foundation/proves-core-reference"
22+
Documentation = "https://docs.proveskit.space/en/latest/"
23+
Issues = "https://github.com/Open-Source-Space-Foundation/proves-core-reference/issues"
24+
25+
[tool.setuptools]
26+
packages = []
27+
28+
[tool.setuptools.dynamic]
29+
dependencies = {file = [
30+
"requirements.txt",
31+
"lib/fprime/requirements.txt",
32+
"lib/zephyr-workspace/zephyr/scripts/requirements-base.txt",
33+
"lib/zephyr-workspace/zephyr/scripts/requirements-build-test.txt",
34+
"lib/zephyr-workspace/zephyr/scripts/requirements-run-test.txt",
35+
]}

requirements.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,2 @@
1-
# Base on:
2-
# -r https://raw.githubusercontent.com/nasa/fprime/refs/tags/v4.0.0a1/requirements.txt
3-
-r lib/fprime/requirements.txt
4-
51
pip
62
west
7-
# Requirements files needed for building Zephyr
8-
# Zephyr workflow requirements removed due to conflicts with F Prime
9-
-r lib/zephyr-workspace/zephyr/scripts/requirements-base.txt
10-
-r lib/zephyr-workspace/zephyr/scripts/requirements-build-test.txt
11-
-r lib/zephyr-workspace/zephyr/scripts/requirements-run-test.txt

0 commit comments

Comments
 (0)