Skip to content

Commit 95db39e

Browse files
joehendrixatomb
authored andcommitted
Move Tools/Python-base into this repo and update CI
Tools/Python-base (the `strata` pip package) was removed from Strata in PR #1351 as part of the repo split. Move it here so that Strata-Python is self-contained for its Python dependencies. Update CI to install from ./Tools/Python-base instead of ./.lake/packages/Strata/Tools/Python-base. Co-authored-by: Aaron Tomb <aarotomb@amazon.com>
1 parent b7e2d00 commit 95db39e

5 files changed

Lines changed: 1294 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ jobs:
4242
with:
4343
python-version: '3.14'
4444
- name: Build using pip
45-
# `strata-base` lives in the Strata package that lake cloned into
46-
# `.lake/packages/Strata`; `strata-python` is in this repo.
45+
# `strata-base` (Tools/Python-base) and `strata-python` (Tools/strata-python)
46+
# both live in this repo.
4747
run: |
48-
pip install ./.lake/packages/Strata/Tools/Python-base
48+
pip install ./Tools/Python-base
4949
pip install ./Tools/strata-python
5050
- name: Run pyInterpret golden-file tests
5151
working-directory: StrataPythonTest
@@ -89,7 +89,7 @@ jobs:
8989
use-restore-keys: "false"
9090
- name: Build using pip
9191
run: |
92-
pip install ./.lake/packages/Strata/Tools/Python-base
92+
pip install ./Tools/Python-base
9393
pip install ./Tools/strata-python
9494
- name: Install Lean
9595
uses: leanprover/lean-action@v1
@@ -157,7 +157,7 @@ jobs:
157157
use-restore-keys: "false"
158158
- name: Build using pip
159159
run: |
160-
pip install ./.lake/packages/Strata/Tools/Python-base
160+
pip install ./Tools/Python-base
161161
pip install ./Tools/strata-python
162162
- name: Install Lean (for lake env)
163163
uses: leanprover/lean-action@v1

Tools/Python-base/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__pycache__

Tools/Python-base/pyproject.toml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[project]
2+
name = "strata"
3+
version = "0.0.1"
4+
description = "Core Strata DDM datatypes and Ion serialization."
5+
requires-python = ">= 3.11"
6+
dependencies = [
7+
"amazon.ion"
8+
]
9+
10+
[tool.hatch.build.targets.wheel]
11+
packages = ["strata"]
12+
13+
[build-system]
14+
requires = ["hatchling"]
15+
build-backend = "hatchling.build"

Tools/Python-base/strata/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)