bedrock-ge 0.2.3__tar.gz → 0.3.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- bedrock_ge-0.3.0/.github/workflows/python-tests.yml +33 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/.gitignore +5 -0
- bedrock_ge-0.3.0/.python-version +1 -0
- bedrock_ge-0.3.0/.vscode/settings.json +7 -0
- bedrock_ge-0.3.0/CODE_OF_CONDUCT.md +133 -0
- bedrock_ge-0.3.0/PKG-INFO +208 -0
- bedrock_ge-0.3.0/README.md +175 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/RELEASE.md +20 -17
- bedrock_ge-0.3.0/examples/hk_kaitak_ags3/hk_kaitak_ags3_to_brgi_geodb.py +449 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/examples/hk_kaitak_ags3/kaitak_ags3.zip +0 -0
- bedrock_ge-0.3.0/examples/hk_kaitak_ags3/kaitak_gi.gpkg +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/pyproject.toml +16 -17
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/data_validation/try_pandera.ipynb +2 -2
- bedrock_ge-0.3.0/sandbox/pyproj_3d_transformations.py +100 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/src/bedrock_ge/__init__.py +1 -1
- bedrock_ge-0.3.0/src/bedrock_ge/gi/ags.py +103 -0
- bedrock_ge-0.3.0/src/bedrock_ge/gi/ags3.py +275 -0
- bedrock_ge-0.3.0/src/bedrock_ge/gi/ags4.py +29 -0
- bedrock_ge-0.2.3/src/bedrock_ge/gi/ags/schemas.py → bedrock_ge-0.3.0/src/bedrock_ge/gi/ags_schemas.py +29 -8
- bedrock_ge-0.3.0/src/bedrock_ge/gi/db_operations.py +128 -0
- bedrock_ge-0.3.0/src/bedrock_ge/gi/geospatial.py +349 -0
- bedrock_ge-0.3.0/src/bedrock_ge/gi/io_utils.py +271 -0
- bedrock_ge-0.3.0/src/bedrock_ge/gi/mapper.py +221 -0
- bedrock_ge-0.3.0/src/bedrock_ge/gi/mapping_models.py +69 -0
- bedrock_ge-0.3.0/src/bedrock_ge/gi/schemas.py +195 -0
- bedrock_ge-0.3.0/src/bedrock_ge/gi/validate.py +119 -0
- bedrock_ge-0.3.0/src/bedrock_ge/gi/write.py +128 -0
- bedrock_ge-0.3.0/src/bedrock_ge/plot.py +4 -0
- bedrock_ge-0.3.0/tests/test_bedrock_ge/__init__.py +0 -0
- bedrock_ge-0.3.0/tests/test_bedrock_ge/gi/__init__.py +0 -0
- bedrock_ge-0.3.0/tests/test_bedrock_ge/gi/data/ags3_sample.ags +14237 -0
- bedrock_ge-0.3.0/tests/test_bedrock_ge/gi/test_ags4.py +23 -0
- bedrock_ge-0.3.0/tests/test_bedrock_ge/gi/test_io_utils.py +63 -0
- bedrock_ge-0.3.0/tests/test_bedrock_ge/test_plot.py +20 -0
- bedrock_ge-0.3.0/tests/test_examples/__init__.py +0 -0
- bedrock_ge-0.3.0/tests/test_examples/conftest.py +8 -0
- bedrock_ge-0.3.0/tests/test_examples/test_hk_kaitak_ags3_to_brgi_geodb.py +149 -0
- bedrock_ge-0.3.0/uv.lock +2894 -0
- bedrock_ge-0.2.3/.python-version +0 -1
- bedrock_ge-0.2.3/PKG-INFO +0 -227
- bedrock_ge-0.2.3/README.md +0 -193
- bedrock_ge-0.2.3/examples/hk_kaitak_ags3/hk_kaitak_ags3_to_brgi_geodb.ipynb +0 -5491
- bedrock_ge-0.2.3/examples/hk_kaitak_ags3/hk_kaitak_ags3_to_brgi_geodb.py +0 -489
- bedrock_ge-0.2.3/examples/hk_kaitak_ags3/kaitak_gi.gpkg +0 -0
- bedrock_ge-0.2.3/sandbox/ags3_to_gis.ipynb +0 -3407
- bedrock_ge-0.2.3/sandbox/bedrock_gi_to_speckle.ipynb +0 -121
- bedrock_ge-0.2.3/src/bedrock_ge/gi/ags/read.py +0 -190
- bedrock_ge-0.2.3/src/bedrock_ge/gi/ags/transform.py +0 -264
- bedrock_ge-0.2.3/src/bedrock_ge/gi/ags/validate.py +0 -25
- bedrock_ge-0.2.3/src/bedrock_ge/gi/brgi-schema.json +0 -36
- bedrock_ge-0.2.3/src/bedrock_ge/gi/concatenate.py +0 -38
- bedrock_ge-0.2.3/src/bedrock_ge/gi/gis_geometry.py +0 -280
- bedrock_ge-0.2.3/src/bedrock_ge/gi/schemas.py +0 -95
- bedrock_ge-0.2.3/src/bedrock_ge/gi/validate.py +0 -182
- bedrock_ge-0.2.3/src/bedrock_ge/gi/write.py +0 -108
- bedrock_ge-0.2.3/src/bedrock_ge/plot.py +0 -2
- bedrock_ge-0.2.3/tests/test_gi.py +0 -31
- bedrock_ge-0.2.3/tests/test_plot.py +0 -2
- bedrock_ge-0.2.3/uv.lock +0 -4282
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/.gitattributes +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/LICENSE +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/examples/README.md +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/examples/hk_kaitak_ags3/64475_ASD012162.ags +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/mypy.ini +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/data_validation/README.md +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/data_validation/bedrock-data-package-schema.json +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/data_validation/bedrock_sql_model.ipynb +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/data_validation/frictionless-table-schema.json +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/data_validation/jsonschema_to_tableschema.py +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/data_validation/my-pandera-schema.json +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/data_validation/pandera-plus-schema.json +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/data_validation/sqlalchemy_to_json.py +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/data_validation/sqlmodel_tutorial.py +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/diggs/AGS Example Template.xml +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/diggs/DIGGS1-DIGGS.XML +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/diggs/DIGGS1.ags +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/hk_ags3/link_insitu_lab_gi/giu_metadata_main.csv +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/hk_ags3/link_insitu_lab_gi/giu_metadata_rel_rep.csv +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/leapfrog_weka_hills/boreholes/Geol.csv +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/leapfrog_weka_hills/boreholes/Location.csv +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/leapfrog_weka_hills/boreholes/SPT.csv +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/leapfrog_weka_hills/cpt/CPT.csv +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/leapfrog_weka_hills/cpt/Location.csv +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/sandbox/leapfrog_weka_hills/leapfrog_csv_to_gis.ipynb +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/src/bedrock_ge/gi/__init__.py +0 -0
- {bedrock_ge-0.2.3/src/bedrock_ge/gi/ags → bedrock_ge-0.3.0/src/bedrock_ge/gi}/ags3_data_dictionary.json +0 -0
- {bedrock_ge-0.2.3/src/bedrock_ge/gi/ags → bedrock_ge-0.3.0/src/bedrock_ge/gi}/ags4_data_dictionary.json +0 -0
- {bedrock_ge-0.2.3 → bedrock_ge-0.3.0}/src/bedrock_ge/gi/sqlmodels.py +0 -0
- {bedrock_ge-0.2.3/src/bedrock_ge/gi/ags → bedrock_ge-0.3.0/tests}/__init__.py +0 -0
- {bedrock_ge-0.2.3/tests/fixtures → bedrock_ge-0.3.0/tests/test_bedrock_ge/gi/data}/ags4_sample.ags +0 -0
- {bedrock_ge-0.2.3/tests/fixtures → bedrock_ge-0.3.0/tests/test_bedrock_ge/gi/data}/asg4_expected.json +0 -0
@@ -0,0 +1,33 @@
|
|
1
|
+
name: Run Python tests
|
2
|
+
|
3
|
+
on:
|
4
|
+
push:
|
5
|
+
branches: [ main, dev ]
|
6
|
+
pull_request:
|
7
|
+
branches: [ main, dev ]
|
8
|
+
|
9
|
+
jobs:
|
10
|
+
test:
|
11
|
+
runs-on: ${{ matrix.os }}
|
12
|
+
strategy:
|
13
|
+
matrix:
|
14
|
+
os: [ubuntu-latest, windows-latest]
|
15
|
+
python-version: ['3.10', '3.12']
|
16
|
+
|
17
|
+
steps:
|
18
|
+
- name: Checkout code
|
19
|
+
uses: actions/checkout@v4
|
20
|
+
|
21
|
+
- name: Install uv
|
22
|
+
uses: astral-sh/setup-uv@v5
|
23
|
+
|
24
|
+
- name: Set up Python
|
25
|
+
uses: actions/setup-python@v5
|
26
|
+
with:
|
27
|
+
python-version: ${{ matrix.python-version }}
|
28
|
+
|
29
|
+
- name: Install bedrock-ge with testing dependencies
|
30
|
+
run: uv sync --locked --group tests
|
31
|
+
|
32
|
+
- name: Run tests
|
33
|
+
run: uv run pytest tests
|
@@ -6,6 +6,8 @@ __marimo__/
|
|
6
6
|
**/log
|
7
7
|
**/tmp
|
8
8
|
**/temp
|
9
|
+
examples/**/raw/
|
10
|
+
examples/**/cleaned/
|
9
11
|
|
10
12
|
# SQLite Databases
|
11
13
|
*.sqlite
|
@@ -117,3 +119,6 @@ cython_debug/
|
|
117
119
|
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
118
120
|
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
119
121
|
.idea/
|
122
|
+
|
123
|
+
# Mac
|
124
|
+
.DS_Store
|
@@ -0,0 +1 @@
|
|
1
|
+
3.10
|
@@ -0,0 +1,133 @@
|
|
1
|
+
|
2
|
+
# Contributor Covenant Code of Conduct
|
3
|
+
|
4
|
+
## Our Pledge
|
5
|
+
|
6
|
+
We as members, contributors, and leaders pledge to make participation in our
|
7
|
+
community a harassment-free experience for everyone, regardless of age, body
|
8
|
+
size, visible or invisible disability, ethnicity, sex characteristics, gender
|
9
|
+
identity and expression, level of experience, education, socio-economic status,
|
10
|
+
nationality, personal appearance, race, caste, color, religion, or sexual
|
11
|
+
identity and orientation.
|
12
|
+
|
13
|
+
We pledge to act and interact in ways that contribute to an open, welcoming,
|
14
|
+
diverse, inclusive, and healthy community.
|
15
|
+
|
16
|
+
## Our Standards
|
17
|
+
|
18
|
+
Examples of behavior that contributes to a positive environment for our
|
19
|
+
community include:
|
20
|
+
|
21
|
+
* Demonstrating empathy and kindness toward other people
|
22
|
+
* Being respectful of differing opinions, viewpoints, and experiences
|
23
|
+
* Giving and gracefully accepting constructive feedback
|
24
|
+
* Accepting responsibility and apologizing to those affected by our mistakes,
|
25
|
+
and learning from the experience
|
26
|
+
* Focusing on what is best not just for us as individuals, but for the overall
|
27
|
+
community
|
28
|
+
|
29
|
+
Examples of unacceptable behavior include:
|
30
|
+
|
31
|
+
* The use of sexualized language or imagery, and sexual attention or advances of
|
32
|
+
any kind
|
33
|
+
* Trolling, insulting or derogatory comments, and personal or political attacks
|
34
|
+
* Public or private harassment
|
35
|
+
* Publishing others' private information, such as a physical or email address,
|
36
|
+
without their explicit permission
|
37
|
+
* Other conduct which could reasonably be considered inappropriate in a
|
38
|
+
professional setting
|
39
|
+
|
40
|
+
## Enforcement Responsibilities
|
41
|
+
|
42
|
+
Community leaders are responsible for clarifying and enforcing our standards of
|
43
|
+
acceptable behavior and will take appropriate and fair corrective action in
|
44
|
+
response to any behavior that they deem inappropriate, threatening, offensive,
|
45
|
+
or harmful.
|
46
|
+
|
47
|
+
Community leaders have the right and responsibility to remove, edit, or reject
|
48
|
+
comments, commits, code, wiki edits, issues, and other contributions that are
|
49
|
+
not aligned to this Code of Conduct, and will communicate reasons for moderation
|
50
|
+
decisions when appropriate.
|
51
|
+
|
52
|
+
## Scope
|
53
|
+
|
54
|
+
This Code of Conduct applies within all community spaces, and also applies when
|
55
|
+
an individual is officially representing the community in public spaces.
|
56
|
+
Examples of representing our community include using an official email address,
|
57
|
+
posting via an official social media account, or acting as an appointed
|
58
|
+
representative at an online or offline event.
|
59
|
+
|
60
|
+
## Enforcement
|
61
|
+
|
62
|
+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
63
|
+
reported to the community leaders responsible for enforcement at
|
64
|
+
info@bedrock.engineer.
|
65
|
+
All complaints will be reviewed and investigated promptly and fairly.
|
66
|
+
|
67
|
+
All community leaders are obligated to respect the privacy and security of the
|
68
|
+
reporter of any incident.
|
69
|
+
|
70
|
+
## Enforcement Guidelines
|
71
|
+
|
72
|
+
Community leaders will follow these Community Impact Guidelines in determining
|
73
|
+
the consequences for any action they deem in violation of this Code of Conduct:
|
74
|
+
|
75
|
+
### 1. Correction
|
76
|
+
|
77
|
+
**Community Impact**: Use of inappropriate language or other behavior deemed
|
78
|
+
unprofessional or unwelcome in the community.
|
79
|
+
|
80
|
+
**Consequence**: A private, written warning from community leaders, providing
|
81
|
+
clarity around the nature of the violation and an explanation of why the
|
82
|
+
behavior was inappropriate. A public apology may be requested.
|
83
|
+
|
84
|
+
### 2. Warning
|
85
|
+
|
86
|
+
**Community Impact**: A violation through a single incident or series of
|
87
|
+
actions.
|
88
|
+
|
89
|
+
**Consequence**: A warning with consequences for continued behavior. No
|
90
|
+
interaction with the people involved, including unsolicited interaction with
|
91
|
+
those enforcing the Code of Conduct, for a specified period of time. This
|
92
|
+
includes avoiding interactions in community spaces as well as external channels
|
93
|
+
like social media. Violating these terms may lead to a temporary or permanent
|
94
|
+
ban.
|
95
|
+
|
96
|
+
### 3. Temporary Ban
|
97
|
+
|
98
|
+
**Community Impact**: A serious violation of community standards, including
|
99
|
+
sustained inappropriate behavior.
|
100
|
+
|
101
|
+
**Consequence**: A temporary ban from any sort of interaction or public
|
102
|
+
communication with the community for a specified period of time. No public or
|
103
|
+
private interaction with the people involved, including unsolicited interaction
|
104
|
+
with those enforcing the Code of Conduct, is allowed during this period.
|
105
|
+
Violating these terms may lead to a permanent ban.
|
106
|
+
|
107
|
+
### 4. Permanent Ban
|
108
|
+
|
109
|
+
**Community Impact**: Demonstrating a pattern of violation of community
|
110
|
+
standards, including sustained inappropriate behavior, harassment of an
|
111
|
+
individual, or aggression toward or disparagement of classes of individuals.
|
112
|
+
|
113
|
+
**Consequence**: A permanent ban from any sort of public interaction within the
|
114
|
+
community.
|
115
|
+
|
116
|
+
## Attribution
|
117
|
+
|
118
|
+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
|
119
|
+
version 2.1, available at
|
120
|
+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
|
121
|
+
|
122
|
+
Community Impact Guidelines were inspired by
|
123
|
+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
|
124
|
+
|
125
|
+
For answers to common questions about this code of conduct, see the FAQ at
|
126
|
+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
|
127
|
+
[https://www.contributor-covenant.org/translations][translations].
|
128
|
+
|
129
|
+
[homepage]: https://www.contributor-covenant.org
|
130
|
+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
|
131
|
+
[Mozilla CoC]: https://github.com/mozilla/diversity
|
132
|
+
[FAQ]: https://www.contributor-covenant.org/faq
|
133
|
+
[translations]: https://www.contributor-covenant.org/translations
|
@@ -0,0 +1,208 @@
|
|
1
|
+
Metadata-Version: 2.4
|
2
|
+
Name: bedrock-ge
|
3
|
+
Version: 0.3.0
|
4
|
+
Summary: Bedrock's Python library for geotechnical engineering.
|
5
|
+
Project-URL: Homepage, https://bedrock.engineer/
|
6
|
+
Project-URL: Source, https://github.com/bedrock-engineer/bedrock-ge
|
7
|
+
Project-URL: Documentation, https://bedrock.engineer/docs/
|
8
|
+
Project-URL: Tracker, https://github.com/bedrock-engineer/bedrock-ge/issues
|
9
|
+
Author-email: Bedrock <info@bedrock.engineer>
|
10
|
+
License: Apache Software License (Apache 2.0)
|
11
|
+
License-File: LICENSE
|
12
|
+
Keywords: aec,aeco,ags,ags3,ags4,bedrock,bim,borehole,borehole-data,civil-engineering,engineering-geology,geo-bim,geoscience-bim,geosciences,geospatial,geospatial-data,geostatistics,geotech,geotechnical,geotechnical-data,geotechnical-engineering,geotechnics,gi-data,gis,ground-engineering,ground-investigation,ground-investigation-data,subsurface,underground
|
13
|
+
Classifier: Development Status :: 3 - Alpha
|
14
|
+
Classifier: Intended Audience :: Education
|
15
|
+
Classifier: Intended Audience :: Science/Research
|
16
|
+
Classifier: License :: OSI Approved :: Apache Software License
|
17
|
+
Classifier: Operating System :: OS Independent
|
18
|
+
Classifier: Programming Language :: Python
|
19
|
+
Classifier: Programming Language :: Python :: 3 :: Only
|
20
|
+
Classifier: Programming Language :: Python :: 3.10
|
21
|
+
Classifier: Programming Language :: Python :: 3.11
|
22
|
+
Classifier: Programming Language :: Python :: 3.12
|
23
|
+
Classifier: Programming Language :: Python :: 3.13
|
24
|
+
Classifier: Topic :: Scientific/Engineering
|
25
|
+
Classifier: Topic :: Scientific/Engineering :: GIS
|
26
|
+
Requires-Python: >=3.10
|
27
|
+
Requires-Dist: geopandas~=1.0
|
28
|
+
Requires-Dist: openpyxl~=3.0
|
29
|
+
Requires-Dist: pandera>=0.23.0
|
30
|
+
Requires-Dist: python-ags4~=1.0
|
31
|
+
Requires-Dist: sqlmodel>=0.0.22
|
32
|
+
Description-Content-Type: text/markdown
|
33
|
+
|
34
|
+
<figure style="margin-inline: block;">
|
35
|
+
<img src="https://bedrock.engineer/public/Bedrock_TextRight.png" alt="Bedrock logo" width="75%"/>
|
36
|
+
</figure>
|
37
|
+
|
38
|
+
<h3 style="margin-inline: block;">Bedrock, the Open Source Foundation for Geotechnical Engineering</h3>
|
39
|
+
|
40
|
+
---
|
41
|
+
|
42
|
+
🌐 **Website:** <https://bedrock.engineer/>
|
43
|
+
|
44
|
+
📃 **Documentation:** <https://bedrock.engineer/docs>
|
45
|
+
|
46
|
+
📃 **API Reference:** <https://bedrock.engineer/reference/>
|
47
|
+
|
48
|
+
🖥️ **Source Code:** <https://github.com/bedrock-engineer/bedrock-ge>
|
49
|
+
|
50
|
+
🐍 **`bedrock-ge` on PyPI:** <https://pypi.org/project/bedrock-ge/>
|
51
|
+
|
52
|
+
🔗 **LinkedIn:** <https://www.linkedin.com/company/bedrock-engineer>
|
53
|
+
|
54
|
+
---
|
55
|
+
|
56
|
+
## Overview
|
57
|
+
|
58
|
+
> **Definition of Bedrock**
|
59
|
+
>
|
60
|
+
> In an abstract sense, the bedrock refers to the main principles something is based on. [1]
|
61
|
+
>
|
62
|
+
> In the real world, the bedrock is the hard area of rock in the ground that holds up the loose soil above. [1]
|
63
|
+
>
|
64
|
+
> In many civil engineering projects, the identification of the bedrock through digging, drilling or geophysical methods is an important task, which greatly influences (geotechnical) design. [2]
|
65
|
+
>
|
66
|
+
> Sources: [[1] Bedrock | Cambridge Dictionary](https://dictionary.cambridge.org/us/dictionary/english/bedrock), [[2] Bedrock | Wikipedia](https://en.wikipedia.org/wiki/Bedrock)
|
67
|
+
|
68
|
+
Ground Investigation (GI) data is often trapped in legacy formats that limit analysis and visualization possibilities.
|
69
|
+
`bedrock-ge` lets you transform this data from specialized geotechnical formats and common tabular formats (Excel, CSV) into modern, standardized geospatial data.
|
70
|
+
|
71
|
+
This standardization lets you bridge the gap between raw geotechnical data, the modern Python (geo)scientific ecosystem and modern geospatial tools.
|
72
|
+
This gives geotechnical engineers greater flexibility in visualization, modeling, and integration across different software environments while avoiding vendor lock-in.
|
73
|
+
For example, this enables connecting your GI data with GIS as well as BIM environments through [platforms like Speckle](#-put-your-gi-data-into-speckle).
|
74
|
+
|
75
|
+
The purpose of Bedrock is NOT to become THE standard for geotechnical data, because [we don't need 15 instead of 14 competing standards](https://xkcd.com/927/).
|
76
|
+
|
77
|
+
## Highlights
|
78
|
+
|
79
|
+
### 📖 Read / write Ground Investigation (GI) data in different formats
|
80
|
+
|
81
|
+
| Data Format | Read | Write |
|
82
|
+
| ----------- | ---- | ----- |
|
83
|
+
| AGS 3 | ✅ | ❌ |
|
84
|
+
| AGS 4 | ✅ | ✅ |
|
85
|
+
| Excel | ✅ | ✅ |
|
86
|
+
| CSV | ✅ | ✅ |
|
87
|
+
| JSON | ✅ | ✅ |
|
88
|
+
| GeoJSON | ✅ | ✅ |
|
89
|
+
|
90
|
+
Do you need another format? Like [DIGGS](https://diggsml.org/), [NADAG](https://www.ngu.no/geologisk-kartlegging/om-nadag-nasjonal-database-grunnundersokelser), [GEF](https://publicwiki.deltares.nl/display/STREAM/Dutch+National+GEF+Standards), or something else?
|
91
|
+
Let us know by creating an [issue](https://github.com/bedrock-engineer/bedrock-ge/issues) or starting a [discussion](https://github.com/orgs/bedrock-engineer/discussions).
|
92
|
+
|
93
|
+
Also, if you have a project with publicly available GI data, please share that in a [discussion](https://github.com/orgs/bedrock-engineer/discussions), such that we can create a tutorial from it.
|
94
|
+
|
95
|
+
### ✅ Validate your GI data
|
96
|
+
|
97
|
+
`bedrock-ge` comes with data validation to make sure that you can combine Ground Investigation data from multiple files into a single geospatial database with consistent relationships between GI locations, samples, in-situ measurements and lab tests.
|
98
|
+
|
99
|
+
This data validation mechanism (based on [`pandera`](https://pandera.readthedocs.io/en/stable/)) is easily extensible, giving you the power to add your own data validation criteria.
|
100
|
+
|
101
|
+
### 🗺️ Put your GI data from multiple files into a single 3D geospatial database
|
102
|
+
|
103
|
+
For example, you can take GI data from 100 AGS files and combine them into a single a [GeoPackage](https://en.wikipedia.org/wiki/GeoPackage) ([like a Shapefile, but then waaay better](http://switchfromshapefile.org/)). Such a GeoPackage can then be loaded into ArcGIS, where you can visualize your GI data in 3D:
|
104
|
+
|
105
|
+
<figure style="margin-inline: block; display: block;">
|
106
|
+
<img src="https://bedrock.engineer/public/images/KaiTak_BrGI_ArcGIS.webp" alt="Kai Tak, Hong Kong, 3D GI data visualization in ArcGIS" width="90%"/>
|
107
|
+
<figcaption>
|
108
|
+
GI data in Kai Tak, Hong Kong. <a href="https://arcg.is/0r9DG9">Click here to explore for yourself.</a>
|
109
|
+
</figcaption>
|
110
|
+
</figure>
|
111
|
+
|
112
|
+
### 🟦 Put your GI data into Speckle
|
113
|
+
|
114
|
+
From ArcGIS or QGIS you can publish your GI data to [Speckle](https://speckle.systems/) and then visualize it together with your ground models and civil engineering designs:
|
115
|
+
|
116
|
+
<figure style="margin-inline: block; display: block;">
|
117
|
+
<img src="https://bedrock.engineer/public/images/KaiTak_BrGI_Speckle.png" alt="Kai Tak, Hong Kong, data from many sources in Speckle." width="90%"/>
|
118
|
+
<figcaption>
|
119
|
+
Models from Rhino, Revit, Civil3D + context & GI data from Q/ArcGIS. <a href="https://app.speckle.systems/projects/013aaf06e7/models/0fa0287ba8,1cbe68ed69,44c8d1ecae,7f9d99cae2,9535541c2b,a739490298,ff81bfa02b">Click here to explore for yourself.</a>
|
120
|
+
</figcaption>
|
121
|
+
</figure>
|
122
|
+
|
123
|
+
<figure style="margin-inline: block; display: block;">
|
124
|
+
<img src="https://bedrock.engineer/public/images/WekaHills_Speckle.webp" alt="GI data, the derived Leapfrog ground model and a tunnel in Speckle." width="90%"/>
|
125
|
+
<figcaption>
|
126
|
+
GI data, the derived Leapfrog ground model and a tunnel in Speckle. <a href="https://app.speckle.systems/projects/7a489ac0d4/models/$epsg:2193-7839%2Fgeo%2Fgeology-model,65b4cf97d5,9069ef2b2b">Click here to explore for yourself.</a>
|
127
|
+
</figcaption>
|
128
|
+
</figure>
|
129
|
+
|
130
|
+
Moreover, your GI data becomes available in all the software that [Speckle has connectors for](https://app.speckle.systems/downloads).
|
131
|
+
|
132
|
+
### 🔓 Free and Open Source Software
|
133
|
+
|
134
|
+
`bedrock-ge` is Free and Open Source Software (FOSS), meaning it gives you full access to the code, and you can customize `bedrock-ge` to integrate with other tools and fit your workflows and project needs.
|
135
|
+
|
136
|
+
As the name implies, FOSS is free to use, so you're not tied to expensive software licenses or locked into a specific software vendor.
|
137
|
+
|
138
|
+
You can give [feedback](#-feedback) and [contribute](#-contributing), such that together we can build the tools we've always wanted and needed.
|
139
|
+
|
140
|
+
## Installation
|
141
|
+
|
142
|
+
We recommend to use [`uv`](https://docs.astral.sh/uv/) to manage Python for you.
|
143
|
+
Using `uv`, you can add `bedrock-ge` to your Python project and install it in your project's virtual environment by running:
|
144
|
+
|
145
|
+
```bash
|
146
|
+
uv add bedrock-ge
|
147
|
+
```
|
148
|
+
|
149
|
+
It's also possible to install `bedrock-ge` from [PyPI](https://pypi.org/project/bedrock-ge/) (Python Packaging Index) using `pip`:
|
150
|
+
|
151
|
+
```bash
|
152
|
+
pip install bedrock-ge
|
153
|
+
```
|
154
|
+
|
155
|
+
## Feedback
|
156
|
+
|
157
|
+
Got some feedback, a great idea, running into problems when working with Bedrock or just want to ask some questions?
|
158
|
+
|
159
|
+
Please feel free to:
|
160
|
+
|
161
|
+
1. Open an issue for feature requests or bug reports: [`bedrock-ge` issues](https://github.com/bedrock-engineer/bedrock-ge/issues),
|
162
|
+
2. Start a discussion in this GitHub repo: [Bedrock discussions](https://github.com/orgs/bedrock-engineer/discussions),
|
163
|
+
3. Or start a discussion on the Speckle community forum if that's more appropriate: [Speckle community forum](https://speckle.community/)
|
164
|
+
|
165
|
+
All feedback and engagement with the Bedrock community is welcome.
|
166
|
+
|
167
|
+
## Contributing
|
168
|
+
|
169
|
+
Contributing isn't scary. Contributing isn't just about writing code:
|
170
|
+
|
171
|
+
- Spread the word about Bedrock
|
172
|
+
- Use Bedrock and provide [feedback](#-feedback)
|
173
|
+
- Share how you use Bedrock
|
174
|
+
- Help each other out, e.g. by replying to questions in the [discussions](https://github.com/orgs/bedrock-engineer/discussions) or [`bedrock-ge` issues](https://github.com/bedrock-engineer/bedrock-ge/issues)
|
175
|
+
- Documentation and tutorials
|
176
|
+
- Most pages on the [bedrock.engineer](https://bedrock.engineer/) website can be edited, so if you see a spelling mistake or have a suggestion on how to explain something better, click this button to make a contribition.
|
177
|
+
|
178
|
+
<figure style="margin-inline: block;">
|
179
|
+
<img src="https://bedrock.engineer/public/images/EditThisPage.png" alt="Edit this page on GitHub button on bedrock.engineer" width="25%"/>
|
180
|
+
</figure>
|
181
|
+
|
182
|
+
- If you would like to contribute code, awesome!
|
183
|
+
Please create an [issue](https://github.com/bedrock-engineer/bedrock-ge/issues) for what you'd like to contribute. If you don't know how to get started, please indicate this in your issue, and we'll help you out.
|
184
|
+
|
185
|
+
## Maintainers
|
186
|
+
|
187
|
+
### Joost
|
188
|
+
|
189
|
+
> I studied geotechnical engineering and applied geophysics and then worked for [Arup](https://www.arup.com/) for 4 years as a geotechnical engineer and [computational designer](https://www.arup.com/services/computational-and-parametric-design/).
|
190
|
+
>
|
191
|
+
> During my time at Arup I worked a lot on bringing computational design into the world of geotechnical engineering, and on [bridging the gaps between geotechnical engineering and structural engineering](https://www.linkedin.com/posts/joost-gevaert_lightbim-lightbim-lightbim-activity-7234726439835549697-3xdO).
|
192
|
+
>
|
193
|
+
> Bedrock is the Free and Open Source Software (FOSS) that I wish existed when I worked as a geotechnical engineer at Arup.
|
194
|
+
|
195
|
+
### Jules
|
196
|
+
|
197
|
+
> I studied Applied Geoscience (Petroleum Engineering Reservoir Geology) but frustration with technical software led me to learn to code and as a result, I mostly worked in software development.
|
198
|
+
>
|
199
|
+
> Over the past 5 years, I’ve worked on data-rich applications across various domains, specifically in frontend development.
|
200
|
+
> My primary interest is figuring out how to build tools for more thoughtful display and processing of technical information, for geoscience in particular.
|
201
|
+
|
202
|
+
## Contributors
|
203
|
+
|
204
|
+
Please take a look at the [contributors page](https://github.com/bedrock-engineer/bedrock-ge/graphs/contributors).
|
205
|
+
|
206
|
+
## Professional Support
|
207
|
+
|
208
|
+
While `bedrock-ge` is an Free Open Source Software (FOSS) project, you might be looking for professional support implementing it, contact <info@bedrock.engineer> for more information.
|
@@ -0,0 +1,175 @@
|
|
1
|
+
<figure style="margin-inline: block;">
|
2
|
+
<img src="https://bedrock.engineer/public/Bedrock_TextRight.png" alt="Bedrock logo" width="75%"/>
|
3
|
+
</figure>
|
4
|
+
|
5
|
+
<h3 style="margin-inline: block;">Bedrock, the Open Source Foundation for Geotechnical Engineering</h3>
|
6
|
+
|
7
|
+
---
|
8
|
+
|
9
|
+
🌐 **Website:** <https://bedrock.engineer/>
|
10
|
+
|
11
|
+
📃 **Documentation:** <https://bedrock.engineer/docs>
|
12
|
+
|
13
|
+
📃 **API Reference:** <https://bedrock.engineer/reference/>
|
14
|
+
|
15
|
+
🖥️ **Source Code:** <https://github.com/bedrock-engineer/bedrock-ge>
|
16
|
+
|
17
|
+
🐍 **`bedrock-ge` on PyPI:** <https://pypi.org/project/bedrock-ge/>
|
18
|
+
|
19
|
+
🔗 **LinkedIn:** <https://www.linkedin.com/company/bedrock-engineer>
|
20
|
+
|
21
|
+
---
|
22
|
+
|
23
|
+
## Overview
|
24
|
+
|
25
|
+
> **Definition of Bedrock**
|
26
|
+
>
|
27
|
+
> In an abstract sense, the bedrock refers to the main principles something is based on. [1]
|
28
|
+
>
|
29
|
+
> In the real world, the bedrock is the hard area of rock in the ground that holds up the loose soil above. [1]
|
30
|
+
>
|
31
|
+
> In many civil engineering projects, the identification of the bedrock through digging, drilling or geophysical methods is an important task, which greatly influences (geotechnical) design. [2]
|
32
|
+
>
|
33
|
+
> Sources: [[1] Bedrock | Cambridge Dictionary](https://dictionary.cambridge.org/us/dictionary/english/bedrock), [[2] Bedrock | Wikipedia](https://en.wikipedia.org/wiki/Bedrock)
|
34
|
+
|
35
|
+
Ground Investigation (GI) data is often trapped in legacy formats that limit analysis and visualization possibilities.
|
36
|
+
`bedrock-ge` lets you transform this data from specialized geotechnical formats and common tabular formats (Excel, CSV) into modern, standardized geospatial data.
|
37
|
+
|
38
|
+
This standardization lets you bridge the gap between raw geotechnical data, the modern Python (geo)scientific ecosystem and modern geospatial tools.
|
39
|
+
This gives geotechnical engineers greater flexibility in visualization, modeling, and integration across different software environments while avoiding vendor lock-in.
|
40
|
+
For example, this enables connecting your GI data with GIS as well as BIM environments through [platforms like Speckle](#-put-your-gi-data-into-speckle).
|
41
|
+
|
42
|
+
The purpose of Bedrock is NOT to become THE standard for geotechnical data, because [we don't need 15 instead of 14 competing standards](https://xkcd.com/927/).
|
43
|
+
|
44
|
+
## Highlights
|
45
|
+
|
46
|
+
### 📖 Read / write Ground Investigation (GI) data in different formats
|
47
|
+
|
48
|
+
| Data Format | Read | Write |
|
49
|
+
| ----------- | ---- | ----- |
|
50
|
+
| AGS 3 | ✅ | ❌ |
|
51
|
+
| AGS 4 | ✅ | ✅ |
|
52
|
+
| Excel | ✅ | ✅ |
|
53
|
+
| CSV | ✅ | ✅ |
|
54
|
+
| JSON | ✅ | ✅ |
|
55
|
+
| GeoJSON | ✅ | ✅ |
|
56
|
+
|
57
|
+
Do you need another format? Like [DIGGS](https://diggsml.org/), [NADAG](https://www.ngu.no/geologisk-kartlegging/om-nadag-nasjonal-database-grunnundersokelser), [GEF](https://publicwiki.deltares.nl/display/STREAM/Dutch+National+GEF+Standards), or something else?
|
58
|
+
Let us know by creating an [issue](https://github.com/bedrock-engineer/bedrock-ge/issues) or starting a [discussion](https://github.com/orgs/bedrock-engineer/discussions).
|
59
|
+
|
60
|
+
Also, if you have a project with publicly available GI data, please share that in a [discussion](https://github.com/orgs/bedrock-engineer/discussions), such that we can create a tutorial from it.
|
61
|
+
|
62
|
+
### ✅ Validate your GI data
|
63
|
+
|
64
|
+
`bedrock-ge` comes with data validation to make sure that you can combine Ground Investigation data from multiple files into a single geospatial database with consistent relationships between GI locations, samples, in-situ measurements and lab tests.
|
65
|
+
|
66
|
+
This data validation mechanism (based on [`pandera`](https://pandera.readthedocs.io/en/stable/)) is easily extensible, giving you the power to add your own data validation criteria.
|
67
|
+
|
68
|
+
### 🗺️ Put your GI data from multiple files into a single 3D geospatial database
|
69
|
+
|
70
|
+
For example, you can take GI data from 100 AGS files and combine them into a single a [GeoPackage](https://en.wikipedia.org/wiki/GeoPackage) ([like a Shapefile, but then waaay better](http://switchfromshapefile.org/)). Such a GeoPackage can then be loaded into ArcGIS, where you can visualize your GI data in 3D:
|
71
|
+
|
72
|
+
<figure style="margin-inline: block; display: block;">
|
73
|
+
<img src="https://bedrock.engineer/public/images/KaiTak_BrGI_ArcGIS.webp" alt="Kai Tak, Hong Kong, 3D GI data visualization in ArcGIS" width="90%"/>
|
74
|
+
<figcaption>
|
75
|
+
GI data in Kai Tak, Hong Kong. <a href="https://arcg.is/0r9DG9">Click here to explore for yourself.</a>
|
76
|
+
</figcaption>
|
77
|
+
</figure>
|
78
|
+
|
79
|
+
### 🟦 Put your GI data into Speckle
|
80
|
+
|
81
|
+
From ArcGIS or QGIS you can publish your GI data to [Speckle](https://speckle.systems/) and then visualize it together with your ground models and civil engineering designs:
|
82
|
+
|
83
|
+
<figure style="margin-inline: block; display: block;">
|
84
|
+
<img src="https://bedrock.engineer/public/images/KaiTak_BrGI_Speckle.png" alt="Kai Tak, Hong Kong, data from many sources in Speckle." width="90%"/>
|
85
|
+
<figcaption>
|
86
|
+
Models from Rhino, Revit, Civil3D + context & GI data from Q/ArcGIS. <a href="https://app.speckle.systems/projects/013aaf06e7/models/0fa0287ba8,1cbe68ed69,44c8d1ecae,7f9d99cae2,9535541c2b,a739490298,ff81bfa02b">Click here to explore for yourself.</a>
|
87
|
+
</figcaption>
|
88
|
+
</figure>
|
89
|
+
|
90
|
+
<figure style="margin-inline: block; display: block;">
|
91
|
+
<img src="https://bedrock.engineer/public/images/WekaHills_Speckle.webp" alt="GI data, the derived Leapfrog ground model and a tunnel in Speckle." width="90%"/>
|
92
|
+
<figcaption>
|
93
|
+
GI data, the derived Leapfrog ground model and a tunnel in Speckle. <a href="https://app.speckle.systems/projects/7a489ac0d4/models/$epsg:2193-7839%2Fgeo%2Fgeology-model,65b4cf97d5,9069ef2b2b">Click here to explore for yourself.</a>
|
94
|
+
</figcaption>
|
95
|
+
</figure>
|
96
|
+
|
97
|
+
Moreover, your GI data becomes available in all the software that [Speckle has connectors for](https://app.speckle.systems/downloads).
|
98
|
+
|
99
|
+
### 🔓 Free and Open Source Software
|
100
|
+
|
101
|
+
`bedrock-ge` is Free and Open Source Software (FOSS), meaning it gives you full access to the code, and you can customize `bedrock-ge` to integrate with other tools and fit your workflows and project needs.
|
102
|
+
|
103
|
+
As the name implies, FOSS is free to use, so you're not tied to expensive software licenses or locked into a specific software vendor.
|
104
|
+
|
105
|
+
You can give [feedback](#-feedback) and [contribute](#-contributing), such that together we can build the tools we've always wanted and needed.
|
106
|
+
|
107
|
+
## Installation
|
108
|
+
|
109
|
+
We recommend to use [`uv`](https://docs.astral.sh/uv/) to manage Python for you.
|
110
|
+
Using `uv`, you can add `bedrock-ge` to your Python project and install it in your project's virtual environment by running:
|
111
|
+
|
112
|
+
```bash
|
113
|
+
uv add bedrock-ge
|
114
|
+
```
|
115
|
+
|
116
|
+
It's also possible to install `bedrock-ge` from [PyPI](https://pypi.org/project/bedrock-ge/) (Python Packaging Index) using `pip`:
|
117
|
+
|
118
|
+
```bash
|
119
|
+
pip install bedrock-ge
|
120
|
+
```
|
121
|
+
|
122
|
+
## Feedback
|
123
|
+
|
124
|
+
Got some feedback, a great idea, running into problems when working with Bedrock or just want to ask some questions?
|
125
|
+
|
126
|
+
Please feel free to:
|
127
|
+
|
128
|
+
1. Open an issue for feature requests or bug reports: [`bedrock-ge` issues](https://github.com/bedrock-engineer/bedrock-ge/issues),
|
129
|
+
2. Start a discussion in this GitHub repo: [Bedrock discussions](https://github.com/orgs/bedrock-engineer/discussions),
|
130
|
+
3. Or start a discussion on the Speckle community forum if that's more appropriate: [Speckle community forum](https://speckle.community/)
|
131
|
+
|
132
|
+
All feedback and engagement with the Bedrock community is welcome.
|
133
|
+
|
134
|
+
## Contributing
|
135
|
+
|
136
|
+
Contributing isn't scary. Contributing isn't just about writing code:
|
137
|
+
|
138
|
+
- Spread the word about Bedrock
|
139
|
+
- Use Bedrock and provide [feedback](#-feedback)
|
140
|
+
- Share how you use Bedrock
|
141
|
+
- Help each other out, e.g. by replying to questions in the [discussions](https://github.com/orgs/bedrock-engineer/discussions) or [`bedrock-ge` issues](https://github.com/bedrock-engineer/bedrock-ge/issues)
|
142
|
+
- Documentation and tutorials
|
143
|
+
- Most pages on the [bedrock.engineer](https://bedrock.engineer/) website can be edited, so if you see a spelling mistake or have a suggestion on how to explain something better, click this button to make a contribition.
|
144
|
+
|
145
|
+
<figure style="margin-inline: block;">
|
146
|
+
<img src="https://bedrock.engineer/public/images/EditThisPage.png" alt="Edit this page on GitHub button on bedrock.engineer" width="25%"/>
|
147
|
+
</figure>
|
148
|
+
|
149
|
+
- If you would like to contribute code, awesome!
|
150
|
+
Please create an [issue](https://github.com/bedrock-engineer/bedrock-ge/issues) for what you'd like to contribute. If you don't know how to get started, please indicate this in your issue, and we'll help you out.
|
151
|
+
|
152
|
+
## Maintainers
|
153
|
+
|
154
|
+
### Joost
|
155
|
+
|
156
|
+
> I studied geotechnical engineering and applied geophysics and then worked for [Arup](https://www.arup.com/) for 4 years as a geotechnical engineer and [computational designer](https://www.arup.com/services/computational-and-parametric-design/).
|
157
|
+
>
|
158
|
+
> During my time at Arup I worked a lot on bringing computational design into the world of geotechnical engineering, and on [bridging the gaps between geotechnical engineering and structural engineering](https://www.linkedin.com/posts/joost-gevaert_lightbim-lightbim-lightbim-activity-7234726439835549697-3xdO).
|
159
|
+
>
|
160
|
+
> Bedrock is the Free and Open Source Software (FOSS) that I wish existed when I worked as a geotechnical engineer at Arup.
|
161
|
+
|
162
|
+
### Jules
|
163
|
+
|
164
|
+
> I studied Applied Geoscience (Petroleum Engineering Reservoir Geology) but frustration with technical software led me to learn to code and as a result, I mostly worked in software development.
|
165
|
+
>
|
166
|
+
> Over the past 5 years, I’ve worked on data-rich applications across various domains, specifically in frontend development.
|
167
|
+
> My primary interest is figuring out how to build tools for more thoughtful display and processing of technical information, for geoscience in particular.
|
168
|
+
|
169
|
+
## Contributors
|
170
|
+
|
171
|
+
Please take a look at the [contributors page](https://github.com/bedrock-engineer/bedrock-ge/graphs/contributors).
|
172
|
+
|
173
|
+
## Professional Support
|
174
|
+
|
175
|
+
While `bedrock-ge` is an Free Open Source Software (FOSS) project, you might be looking for professional support implementing it, contact <info@bedrock.engineer> for more information.
|
@@ -11,17 +11,22 @@ Follow [Semantic Versioning](https://semver.org/) (e.g., `1.0.0`, `1.1.0`, `1.1.
|
|
11
11
|
Update the version number in:
|
12
12
|
|
13
13
|
- [`pyproject.toml`](pyproject.toml)
|
14
|
-
- [`/src/bedrock/__init__.py`](/src/
|
14
|
+
- [`/src/bedrock/__init__.py`](/src/bedrock_ge/__init__.py)
|
15
|
+
- Inline script dependencies of marimo notebooks in [`examples`](/examples/)
|
15
16
|
|
16
|
-
## 2. Update
|
17
|
+
## 2. Update `uv.lock`
|
17
18
|
|
18
|
-
|
19
|
+
The version of `bedrock-ge` in the `uv.lock` file needs to be updated such that tests can run properly. Therefore run:
|
19
20
|
|
20
|
-
|
21
|
+
```bash
|
22
|
+
uv sync --all-groups --upgrade
|
23
|
+
```
|
24
|
+
|
25
|
+
## 3. PR `dev` → `main`
|
21
26
|
|
22
|
-
|
27
|
+
Open a pull request (PR) from `dev` to `main`.
|
23
28
|
|
24
|
-
|
29
|
+
This also runs the automated tests.
|
25
30
|
|
26
31
|
## 4. Commit the Changes
|
27
32
|
|
@@ -32,15 +37,11 @@ git add .
|
|
32
37
|
git commit -m "Release version X.Y.Z"
|
33
38
|
```
|
34
39
|
|
35
|
-
## 5.
|
36
|
-
|
37
|
-
Open a pull request (PR) from `dev` to `main`.
|
38
|
-
|
39
|
-
## 6. Merge `dev` into `main`
|
40
|
+
## 5. Merge `dev` into `main`
|
40
41
|
|
41
42
|
Once everything is ready, and the PR is approved, merge `dev` into `main`. This officially brings all the changes in `dev` into the release-ready `main` branch.
|
42
43
|
|
43
|
-
##
|
44
|
+
## 6. Tag the Release
|
44
45
|
|
45
46
|
Create a Git tag for the new version:
|
46
47
|
|
@@ -50,7 +51,7 @@ git tag X.Y.Z
|
|
50
51
|
git push origin X.Y.Z
|
51
52
|
```
|
52
53
|
|
53
|
-
##
|
54
|
+
## 7. Build the Distribution
|
54
55
|
|
55
56
|
Create source and wheel distributions:
|
56
57
|
|
@@ -58,6 +59,12 @@ Create source and wheel distributions:
|
|
58
59
|
uv build
|
59
60
|
```
|
60
61
|
|
62
|
+
This creates a `bedrock_ge-X.Y.Z.tar.gz` file (source) and a `bedrock_ge-X.Y.Z-py3-none-any.whl` file (wheel) in the `/dist` folder.
|
63
|
+
|
64
|
+
## 8. Remove the old distribution
|
65
|
+
|
66
|
+
In order for the `uv publish` command to work properly, only one version of the distriution can be inside the `/dist` folder. Therefore delete the old source and wheel files.
|
67
|
+
|
61
68
|
## 9. Publish to PyPI
|
62
69
|
|
63
70
|
1. Set the `UV_PUBLISH_TOKEN` environment variable. Copy from `.env`.
|
@@ -68,10 +75,6 @@ set UV_PUBLISH_TOKEN=pypi-blablabla
|
|
68
75
|
uv publish
|
69
76
|
```
|
70
77
|
|
71
|
-
> ⚠️ **Attention:**
|
72
|
-
>
|
73
|
-
> You might have to delete previous distributions of the Python package in `dist/*`
|
74
|
-
|
75
78
|
## 10. Verify the Release
|
76
79
|
|
77
80
|
Check that the new version is available on PyPI:
|