Skip to content

Commit 41646a9

Browse files
authored
Merge pull request #48 from bedrock-engineer/dev
Release 0.3.0
2 parents e513b3e + 2f870ce commit 41646a9

39 files changed

+17245
-12671
lines changed

.github/workflows/python-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [ubuntu-latest, windows-latest]
15-
python-version: ['3.9']
15+
python-version: ['3.10', '3.12']
1616

1717
steps:
1818
- name: Checkout code

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ __marimo__/
66
**/log
77
**/tmp
88
**/temp
9+
examples/**/raw/
10+
examples/**/cleaned/
911

1012
# SQLite Databases
1113
*.sqlite

.python-version

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

RELEASE.md

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,19 @@ Update the version number in:
1414
- [`/src/bedrock/__init__.py`](/src/bedrock_ge/__init__.py)
1515
- Inline script dependencies of marimo notebooks in [`examples`](/examples/)
1616

17-
## 2. Update the Changelog
17+
## 2. Update `uv.lock`
1818

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:
2020

21-
## 3. Run Tests
21+
```bash
22+
uv sync --all-groups --upgrade
23+
```
24+
25+
## 3. PR `dev``main`
2226

23-
Ensure that all tests pass by running your test suite.
27+
Open a pull request (PR) from `dev` to `main`.
2428

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.
2630

2731
## 4. Commit the Changes
2832

@@ -33,15 +37,11 @@ git add .
3337
git commit -m "Release version X.Y.Z"
3438
```
3539

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`
4141

4242
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.
4343

44-
## 7. Tag the Release
44+
## 6. Tag the Release
4545

4646
Create a Git tag for the new version:
4747

@@ -51,14 +51,20 @@ git tag X.Y.Z
5151
git push origin X.Y.Z
5252
```
5353

54-
## 8. Build the Distribution
54+
## 7. Build the Distribution
5555

5656
Create source and wheel distributions:
5757

5858
```bash
5959
uv build
6060
```
6161

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+
6268
## 9. Publish to PyPI
6369

6470
1. Set the `UV_PUBLISH_TOKEN` environment variable. Copy from `.env`.
@@ -69,10 +75,6 @@ set UV_PUBLISH_TOKEN=pypi-blablabla
6975
uv publish
7076
```
7177

72-
> ⚠️ **Attention:**
73-
>
74-
> You might have to delete previous distributions of the Python package in `dist/*`
75-
7678
## 10. Verify the Release
7779

7880
Check that the new version is available on PyPI:

examples/hk_kaitak_ags3/hk_kaitak_ags3_to_brgi_geodb.ipynb

Lines changed: 0 additions & 5491 deletions
This file was deleted.

examples/hk_kaitak_ags3/hk_kaitak_ags3_to_brgi_geodb.py

Lines changed: 254 additions & 294 deletions
Large diffs are not rendered by default.
19.7 MB
Binary file not shown.

pyproject.toml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[project]
22
name = "bedrock-ge"
3-
version = "0.2.4"
3+
version = "0.3.0"
44
description = "Bedrock's Python library for geotechnical engineering."
55
authors = [
66
{name = "Bedrock", email = "[email protected]"}
77
]
88
license = {text = "Apache Software License (Apache 2.0)"}
99
readme = "README.md"
10-
requires-python = ">=3.9"
10+
requires-python = ">=3.10"
1111
dependencies = [
1212
"geopandas~=1.0",
1313
"openpyxl~=3.0",
@@ -55,7 +55,6 @@ classifiers = [
5555
"Topic :: Scientific/Engineering",
5656
"Topic :: Scientific/Engineering :: GIS",
5757
"Programming Language :: Python",
58-
"Programming Language :: Python :: 3.9",
5958
"Programming Language :: Python :: 3.10",
6059
"Programming Language :: Python :: 3.11",
6160
"Programming Language :: Python :: 3.12",
@@ -72,21 +71,17 @@ Tracker = "https://github.com/bedrock-engineer/bedrock-ge/issues"
7271

7372
[dependency-groups]
7473
dev = [
75-
"duckdb>=1.2.2",
76-
"folium>=0.17.0",
7774
"frictionless[excel]>=4.40.8",
78-
"jupyter>=1.1.1",
79-
"mapclassify>=2.8.1",
80-
"marimo>=0.12.5",
81-
"matplotlib>=3.9.2",
75+
"marimo[recommended]>=0.13.11",
8276
"mypy>=1.11.2",
83-
"nbconvert>=7.16.6",
8477
"pandas-stubs>=2.2.2.240807",
85-
"ruff>=0.6.7",
86-
"sqlglot>=26.12.1",
8778
]
8879

8980
tests = [
81+
"folium>=0.17.0",
82+
"mapclassify>=2.8.1",
83+
"marimo>=0.13.11",
84+
"matplotlib>=3.9.2",
9085
"pytest>=8.3.3",
9186
]
9287

0 commit comments

Comments
 (0)