Merge pull request #40 from bedrock-engineer/test-kaitak-nb-w-local-brgi

Adapt the Kai Tak, HK marimo notebook test such that it runs with latest code

Author: JulesBlm

.github/workflows/python-tests.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ['3.9']
+        python-version: ['3.9', '3.12']
 
     steps:
     - name: Checkout code

RELEASE.md

@@ -14,15 +14,11 @@ Update the version number in:
 - [`/src/bedrock/__init__.py`](/src/bedrock_ge/__init__.py)
 - Inline script dependencies of marimo notebooks in [`examples`](/examples/)
 
-## 2. Update the Changelog
+## 3. PR `dev` → `main`
 
-Update `CHANGELOG.md` with details about the new release. Include any new features, bug fixes, or breaking changes.
-
-## 3. Run Tests
-
-Ensure that all tests pass by running your test suite.
+Open a pull request (PR) from `dev` to `main`.
 
-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`.
+This also runs the automated tests.
 
 ## 4. Commit the Changes
 
@@ -33,15 +29,11 @@ git add .
 git commit -m "Release version X.Y.Z"
 ```
 
-## 5. Prepare for Merge
-
-Open a pull request (PR) from `dev` to `main`.
-
-## 6. Merge `dev` into `main`
+## 5. Merge `dev` into `main`
 
 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.
 
-## 7. Tag the Release
+## 6. Tag the Release
 
 Create a Git tag for the new version:
 
@@ -51,14 +43,20 @@ git tag X.Y.Z
 git push origin X.Y.Z
 ```
 
-## 8. Build the Distribution
+## 7. Build the Distribution
 
 Create source and wheel distributions:
 
 ```bash
 uv build
 ```
 
+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.
+
+## 8. Remove the old distribution
+
+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.
+
 ## 9. Publish to PyPI
 
 1. Set the `UV_PUBLISH_TOKEN` environment variable. Copy from `.env`.
@@ -69,10 +67,6 @@ set UV_PUBLISH_TOKEN=pypi-blablabla
 uv publish
 ```
 
-> ⚠️ **Attention:**
->
-> You might have to delete previous distributions of the Python package in `dist/*`
-
 ## 10. Verify the Release
 
 Check that the new version is available on PyPI:  

examples/hk_kaitak_ags3/hk_kaitak_ags3_to_brgi_geodb.py

@@ -1,7 +1,7 @@
 # /// script
 # requires-python = ">=3.12"
 # dependencies = [
-#     "bedrock-ge==0.2.3",
+#     "bedrock-ge==0.2.4",
 #     "chardet==5.2.0",
 #     "folium==0.19.5",
 #     "geopandas==1.0.1",

pyproject.toml

@@ -73,12 +73,9 @@ Tracker = "https://github.com/bedrock-engineer/bedrock-ge/issues"
 [dependency-groups]
 dev = [
     "duckdb>=1.2.2",
-    "folium>=0.17.0",
     "frictionless[excel]>=4.40.8",
     "jupyter>=1.1.1",
-    "mapclassify>=2.8.1",
     "marimo>=0.12.5",
-    "matplotlib>=3.9.2",
     "mypy>=1.11.2",
     "nbconvert>=7.16.6",
     "pandas-stubs>=2.2.2.240807",
@@ -87,6 +84,9 @@ dev = [
 ]
 
 tests = [
+    "folium>=0.17.0",
+    "mapclassify>=2.8.1",
+    "matplotlib>=3.9.2",
     "pytest>=8.3.3",
 ]
 

tests/test_examples/test_hk_kaitak_ags3_to_brgi_geodb.py

@@ -44,7 +44,8 @@ def test_kaitak_ags3_notebook_runs_and_creates_gpkg(examples_dir):
         env = os.environ.copy()
         env["PYTHONIOENCODING"] = "utf-8"
         result = subprocess.run(
-            ["uvx", "uv", "run", "--no-project", "--no-cache", str(notebook_path)],
+            # ["uvx", "uv", "run", "--no-project", "--no-cache", str(notebook_path)],
+            ["uv", "run", str(notebook_path)],
             check=False,
             capture_output=True,
             text=True,