bedrock-ge 0.2.4__tar.gz → 0.3.1__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.
Files changed (87) hide show
  1. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/.github/workflows/python-tests.yml +1 -1
  2. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/.gitignore +2 -0
  3. bedrock_ge-0.3.1/.python-version +1 -0
  4. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/PKG-INFO +3 -3
  5. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/RELEASE.md +18 -16
  6. bedrock_ge-0.3.1/examples/hk_kaitak_ags3/hk_kaitak_ags3_to_brgi_geodb.py +855 -0
  7. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/examples/hk_kaitak_ags3/kaitak_ags3.zip +0 -0
  8. bedrock_ge-0.3.1/examples/hk_kaitak_ags3/kaitak_gi.gpkg +0 -0
  9. bedrock_ge-0.3.1/examples/uk_silvertown_tunnel_ags4/20110770-2021-02-16_1308-Final-6.ags +17797 -0
  10. bedrock_ge-0.3.1/examples/uk_silvertown_tunnel_ags4/uk_silvertown_tunnel_ags4_to_brgi_geodb.py +104 -0
  11. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/pyproject.toml +8 -12
  12. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/data_validation/try_pandera.ipynb +2 -2
  13. bedrock_ge-0.3.1/sandbox/pyproj_3d_transformations.py +100 -0
  14. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/src/bedrock_ge/__init__.py +1 -1
  15. bedrock_ge-0.3.1/src/bedrock_ge/gi/ags.py +103 -0
  16. bedrock_ge-0.3.1/src/bedrock_ge/gi/ags3.py +275 -0
  17. bedrock_ge-0.3.1/src/bedrock_ge/gi/ags4.py +29 -0
  18. bedrock_ge-0.2.4/src/bedrock_ge/gi/ags/schemas.py → bedrock_ge-0.3.1/src/bedrock_ge/gi/ags_schemas.py +29 -8
  19. bedrock_ge-0.3.1/src/bedrock_ge/gi/db_operations.py +128 -0
  20. bedrock_ge-0.3.1/src/bedrock_ge/gi/geospatial.py +349 -0
  21. bedrock_ge-0.3.1/src/bedrock_ge/gi/io_utils.py +271 -0
  22. bedrock_ge-0.3.1/src/bedrock_ge/gi/mapper.py +221 -0
  23. bedrock_ge-0.3.1/src/bedrock_ge/gi/mapping_models.py +69 -0
  24. bedrock_ge-0.3.1/src/bedrock_ge/gi/schemas.py +195 -0
  25. bedrock_ge-0.3.1/src/bedrock_ge/gi/validate.py +119 -0
  26. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/src/bedrock_ge/gi/write.py +54 -37
  27. bedrock_ge-0.3.1/tests/test_bedrock_ge/gi/data/ags3_sample.ags +14237 -0
  28. bedrock_ge-0.2.4/tests/test_bedrock_ge/gi/test_ags.py → bedrock_ge-0.3.1/tests/test_bedrock_ge/gi/test_ags4.py +3 -6
  29. bedrock_ge-0.3.1/tests/test_bedrock_ge/gi/test_io_utils.py +63 -0
  30. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/tests/test_examples/test_hk_kaitak_ags3_to_brgi_geodb.py +36 -26
  31. bedrock_ge-0.3.1/uv.lock +2896 -0
  32. bedrock_ge-0.2.4/examples/hk_kaitak_ags3/hk_kaitak_ags3_to_brgi_geodb.ipynb +0 -5491
  33. bedrock_ge-0.2.4/examples/hk_kaitak_ags3/hk_kaitak_ags3_to_brgi_geodb.py +0 -489
  34. bedrock_ge-0.2.4/examples/hk_kaitak_ags3/kaitak_gi.gpkg +0 -0
  35. bedrock_ge-0.2.4/sandbox/ags3_to_gis.ipynb +0 -3407
  36. bedrock_ge-0.2.4/sandbox/bedrock_gi_to_speckle.ipynb +0 -121
  37. bedrock_ge-0.2.4/src/bedrock_ge/gi/ags/read.py +0 -192
  38. bedrock_ge-0.2.4/src/bedrock_ge/gi/ags/transform.py +0 -264
  39. bedrock_ge-0.2.4/src/bedrock_ge/gi/ags/validate.py +0 -25
  40. bedrock_ge-0.2.4/src/bedrock_ge/gi/brgi-schema.json +0 -36
  41. bedrock_ge-0.2.4/src/bedrock_ge/gi/concatenate.py +0 -38
  42. bedrock_ge-0.2.4/src/bedrock_ge/gi/gis_geometry.py +0 -282
  43. bedrock_ge-0.2.4/src/bedrock_ge/gi/schemas.py +0 -95
  44. bedrock_ge-0.2.4/src/bedrock_ge/gi/validate.py +0 -182
  45. bedrock_ge-0.2.4/tests/test_examples/__init__.py +0 -0
  46. bedrock_ge-0.2.4/uv.lock +0 -4351
  47. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/.gitattributes +0 -0
  48. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/.vscode/settings.json +0 -0
  49. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/CODE_OF_CONDUCT.md +0 -0
  50. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/LICENSE +0 -0
  51. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/README.md +0 -0
  52. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/examples/README.md +0 -0
  53. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/examples/hk_kaitak_ags3/64475_ASD012162.ags +0 -0
  54. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/mypy.ini +0 -0
  55. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/data_validation/README.md +0 -0
  56. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/data_validation/bedrock-data-package-schema.json +0 -0
  57. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/data_validation/bedrock_sql_model.ipynb +0 -0
  58. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/data_validation/frictionless-table-schema.json +0 -0
  59. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/data_validation/jsonschema_to_tableschema.py +0 -0
  60. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/data_validation/my-pandera-schema.json +0 -0
  61. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/data_validation/pandera-plus-schema.json +0 -0
  62. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/data_validation/sqlalchemy_to_json.py +0 -0
  63. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/data_validation/sqlmodel_tutorial.py +0 -0
  64. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/diggs/AGS Example Template.xml +0 -0
  65. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/diggs/DIGGS1-DIGGS.XML +0 -0
  66. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/diggs/DIGGS1.ags +0 -0
  67. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/hk_ags3/link_insitu_lab_gi/giu_metadata_main.csv +0 -0
  68. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/hk_ags3/link_insitu_lab_gi/giu_metadata_rel_rep.csv +0 -0
  69. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/leapfrog_weka_hills/boreholes/Geol.csv +0 -0
  70. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/leapfrog_weka_hills/boreholes/Location.csv +0 -0
  71. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/leapfrog_weka_hills/boreholes/SPT.csv +0 -0
  72. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/leapfrog_weka_hills/cpt/CPT.csv +0 -0
  73. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/leapfrog_weka_hills/cpt/Location.csv +0 -0
  74. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/sandbox/leapfrog_weka_hills/leapfrog_csv_to_gis.ipynb +0 -0
  75. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/src/bedrock_ge/gi/__init__.py +0 -0
  76. {bedrock_ge-0.2.4/src/bedrock_ge/gi/ags → bedrock_ge-0.3.1/src/bedrock_ge/gi}/ags3_data_dictionary.json +0 -0
  77. {bedrock_ge-0.2.4/src/bedrock_ge/gi/ags → bedrock_ge-0.3.1/src/bedrock_ge/gi}/ags4_data_dictionary.json +0 -0
  78. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/src/bedrock_ge/gi/sqlmodels.py +0 -0
  79. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/src/bedrock_ge/plot.py +0 -0
  80. {bedrock_ge-0.2.4/src/bedrock_ge/gi/ags → bedrock_ge-0.3.1/tests}/__init__.py +0 -0
  81. {bedrock_ge-0.2.4/tests → bedrock_ge-0.3.1/tests/test_bedrock_ge}/__init__.py +0 -0
  82. {bedrock_ge-0.2.4/tests/test_bedrock_ge → bedrock_ge-0.3.1/tests/test_bedrock_ge/gi}/__init__.py +0 -0
  83. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/tests/test_bedrock_ge/gi/data/ags4_sample.ags +0 -0
  84. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/tests/test_bedrock_ge/gi/data/asg4_expected.json +0 -0
  85. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/tests/test_bedrock_ge/test_plot.py +0 -0
  86. {bedrock_ge-0.2.4/tests/test_bedrock_ge/gi → bedrock_ge-0.3.1/tests/test_examples}/__init__.py +0 -0
  87. {bedrock_ge-0.2.4 → bedrock_ge-0.3.1}/tests/test_examples/conftest.py +0 -0
@@ -12,7 +12,7 @@ jobs:
12
12
  strategy:
13
13
  matrix:
14
14
  os: [ubuntu-latest, windows-latest]
15
- python-version: ['3.9']
15
+ python-version: ['3.10', '3.12']
16
16
 
17
17
  steps:
18
18
  - name: Checkout code
@@ -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
@@ -0,0 +1 @@
1
+ 3.10
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: bedrock-ge
3
- Version: 0.2.4
3
+ Version: 0.3.1
4
4
  Summary: Bedrock's Python library for geotechnical engineering.
5
5
  Project-URL: Homepage, https://bedrock.engineer/
6
6
  Project-URL: Source, https://github.com/bedrock-engineer/bedrock-ge
@@ -17,14 +17,14 @@ Classifier: License :: OSI Approved :: Apache Software License
17
17
  Classifier: Operating System :: OS Independent
18
18
  Classifier: Programming Language :: Python
19
19
  Classifier: Programming Language :: Python :: 3 :: Only
20
- Classifier: Programming Language :: Python :: 3.9
21
20
  Classifier: Programming Language :: Python :: 3.10
22
21
  Classifier: Programming Language :: Python :: 3.11
23
22
  Classifier: Programming Language :: Python :: 3.12
24
23
  Classifier: Programming Language :: Python :: 3.13
25
24
  Classifier: Topic :: Scientific/Engineering
26
25
  Classifier: Topic :: Scientific/Engineering :: GIS
27
- Requires-Python: >=3.9
26
+ Requires-Python: >=3.10
27
+ Requires-Dist: chardet>=5.2.0
28
28
  Requires-Dist: geopandas~=1.0
29
29
  Requires-Dist: openpyxl~=3.0
30
30
  Requires-Dist: pandera>=0.23.0
@@ -14,15 +14,19 @@ Update the version number in:
14
14
  - [`/src/bedrock/__init__.py`](/src/bedrock_ge/__init__.py)
15
15
  - Inline script dependencies of marimo notebooks in [`examples`](/examples/)
16
16
 
17
- ## 2. Update the Changelog
17
+ ## 2. Update `uv.lock`
18
18
 
19
- Update `CHANGELOG.md` with details about the new release. Include any new features, bug fixes, or breaking changes.
19
+ The version of `bedrock-ge` in the `uv.lock` file needs to be updated such that tests can run properly. Therefore run:
20
20
 
21
- ## 3. Run Tests
21
+ ```bash
22
+ uv sync --all-groups --upgrade
23
+ ```
24
+
25
+ ## 3. PR `dev` → `main`
22
26
 
23
- Ensure that all tests pass by running your test suite.
27
+ Open a pull request (PR) from `dev` to `main`.
24
28
 
25
- To automate this, it's possible to set up a CI (Continuous Integration) pipeline to confirm everything works in multiple environments, e.g. with `GitHub Actions`.
29
+ This also runs the automated tests.
26
30
 
27
31
  ## 4. Commit the Changes
28
32
 
@@ -33,15 +37,11 @@ git add .
33
37
  git commit -m "Release version X.Y.Z"
34
38
  ```
35
39
 
36
- ## 5. Prepare for Merge
37
-
38
- Open a pull request (PR) from `dev` to `main`.
39
-
40
- ## 6. Merge `dev` into `main`
40
+ ## 5. Merge `dev` into `main`
41
41
 
42
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.
43
43
 
44
- ## 7. Tag the Release
44
+ ## 6. Tag the Release
45
45
 
46
46
  Create a Git tag for the new version:
47
47
 
@@ -51,7 +51,7 @@ git tag X.Y.Z
51
51
  git push origin X.Y.Z
52
52
  ```
53
53
 
54
- ## 8. Build the Distribution
54
+ ## 7. Build the Distribution
55
55
 
56
56
  Create source and wheel distributions:
57
57
 
@@ -59,6 +59,12 @@ Create source and wheel distributions:
59
59
  uv build
60
60
  ```
61
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
+
62
68
  ## 9. Publish to PyPI
63
69
 
64
70
  1. Set the `UV_PUBLISH_TOKEN` environment variable. Copy from `.env`.
@@ -69,10 +75,6 @@ set UV_PUBLISH_TOKEN=pypi-blablabla
69
75
  uv publish
70
76
  ```
71
77
 
72
- > ⚠️ **Attention:**
73
- >
74
- > You might have to delete previous distributions of the Python package in `dist/*`
75
-
76
78
  ## 10. Verify the Release
77
79
 
78
80
  Check that the new version is available on PyPI: