Skip to content

Commit f8c007f

Browse files
authored
Merge pull request #70 from bedrock-engineer/dev
Patch too strict validation for In-Situ tests
2 parents 70e9b07 + 01a6513 commit f8c007f

File tree

6 files changed

+1255
-1019
lines changed

6 files changed

+1255
-1019
lines changed

RELEASE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ Create a Git tag for the new version:
4747

4848
```bash
4949
git checkout main
50+
git pull
5051
git tag X.Y.Z
5152
git push origin X.Y.Z
5253
```

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "bedrock-ge"
3-
version = "0.3.2"
3+
version = "0.3.3"
44
description = "Bedrock's Python library for geotechnical engineering."
55
authors = [
66
{name = "Bedrock", email = "info@bedrock.engineer"}

src/bedrock_ge/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
"""Bedrock, the open source foundation for ground engineering."""
22

3-
__version__ = "0.3.2"
3+
__version__ = "0.3.3"

src/bedrock_ge/gi/mapping_models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class LabTestTableMapping(OtherTable):
6363
class BedrockGIMapping(BaseModel):
6464
Project: ProjectTableMapping
6565
Location: LocationTableMapping
66-
InSitu: list[InSituTestTableMapping]
66+
InSitu: list[InSituTestTableMapping] = []
6767
Sample: Union[SampleTableMapping, None] = None
6868
Lab: list[LabTestTableMapping] = []
6969
Other: list[OtherTable] = []

src/bedrock_ge/gi/schemas.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class InSituTestSchema(pa.DataFrameModel):
7070
# foreign_key="location.location_uid"
7171
)
7272
depth_to_top: Optional[Series[float]] = pa.Field(nullable=True, coerce=True, ge=0)
73-
depth_to_base: Optional[Series[float]] = pa.Field(nullable=True, coerce=True, gt=0)
73+
depth_to_base: Optional[Series[float]] = pa.Field(nullable=True, coerce=True, ge=0)
7474

7575
# https://pandera.readthedocs.io/en/stable/dataframe_models.html#dataframe-checks
7676
# Check depth column completeness such that either shapely.Point's or

0 commit comments

Comments
 (0)