fix: Fix merge conflict

.github/workflows/build-ci.yml

@@ -13,8 +13,8 @@ on:
 
 jobs:
   ci-build:
-    uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.0.1
+    uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.2.4
     with:
       build_target: ci
       image_tags: |
-        "ghcr.io/hotosm/osm-rawdata:ci"
+        "ghcr.io/${{ github.repository }}:ci"

.github/workflows/build.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   ci-build:
-    uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.0.1
+    uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.2.4
     with:
       build_target: prod
       image_name: "ghcr.io/${{ github.repository }}"

.github/workflows/docs.yml

@@ -12,12 +12,12 @@ on:
 
 jobs:
   build_doxygen:
-    uses: hotosm/gh-workflows/.github/workflows/doxygen_build.yml@1.0.1
+    uses: hotosm/gh-workflows/.github/workflows/doxygen_build.yml@1.2.4
     with:
       output_path: docs/apidocs
 
   publish_docs:
-    uses: hotosm/gh-workflows/.github/workflows/mkdocs_build.yml@1.0.1
+    uses: hotosm/gh-workflows/.github/workflows/mkdocs_build.yml@1.2.4
     needs: [build_doxygen]
     with:
       image: ghcr.io/${{ github.repository }}:ci

.github/workflows/publish.yml

@@ -8,6 +8,6 @@ on:
 
 jobs:
   publish_to_pypi:
-    uses: hotosm/gh-workflows/.github/workflows/pypi_publish.yml@1.0.1
+    uses: hotosm/gh-workflows/.github/workflows/pypi_publish.yml@1.2.4
     secrets:
       PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}

.github/workflows/pytest.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   pytest:
-    uses: hotosm/gh-workflows/.github/workflows/test_pytest.yml@1.0.1
+    uses: hotosm/gh-workflows/.github/workflows/test_pytest.yml@1.2.4
     with:
       image_name: ghcr.io/${{ github.repository }}
       tag_override: ${{ github.event_name == 'push' && 'ci' || '' }}

.github/workflows/wiki.yml

@@ -10,6 +10,6 @@ on:
 
 jobs:
   publish-docs-to-wiki:
-    uses: hotosm/gh-workflows/.github/workflows/wiki.yml@1.0.1
+    uses: hotosm/gh-workflows/.github/workflows/wiki.yml@1.2.4
     with:
       homepage_path: "wiki_redirect.md"

.pre-commit-config.yaml

@@ -8,21 +8,21 @@ repos:
 
   # Autoformat: Python code
   - repo: https://github.com/psf/black
-    rev: 23.10.1
+    rev: 23.11.0
     hooks:
       - id: black
 
   # Lint / autoformat: Python code
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: "v0.1.4"
+    rev: "v0.1.5"
     hooks:
       - id: ruff
         args: [--exit-non-zero-on-fix]
 
   # Autoformat: YAML, JSON, Markdown, etc.
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.3
+    rev: v3.1.0
     hooks:
       - id: prettier
         args: [--ignore-unknown, --no-error-on-unmatched-pattern, "!chart/**"]

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.3.8 (2023-11-18)
+
+### Fix
+
+- Make less verbose
+- Always escape the value for embedded quotes
+- Fix bug with referencing an out of scope variable
+- Use geojson instead of json to read in the boundary file
+- Don't call OsmFile.footer, it's now handled by a destructor
+- Add link to XLSForm design doc
+
 ## 0.3.7 (2023-10-23)
 
 ### Fix

Dockerfile

@@ -142,6 +142,7 @@ CMD [""]
 
 FROM runtime as prod
 # Pre-compile packages to .pyc (init speed gains)
-RUN python -c "import compileall; compileall.compile_path(maxlevels=10, quiet=1)"
+RUN python -c "import compileall; compileall.compile_path(maxlevels=10, quiet=1)" \
+    && chmod +x /container-entrypoint.sh
 ENTRYPOINT ["/container-entrypoint.sh"]
 CMD ["bash"]

Makefile

@@ -18,7 +18,7 @@
 
 PACKAGE := org.osm_fieldwork.py
 NAME := osm-fieldwork
-VERSION := 0.3.7
+VERSION := 0.3.8
 
 # All python source files
 FILES := $(wildcard ./osm_fieldwork/*.py)

osm_fieldwork/__version__.py

@@ -1 +1 @@
-__version__ = "0.3.7"
+__version__ = "0.3.8"

osm_fieldwork/basemapper.py

@@ -20,7 +20,6 @@
 
 import argparse
 import concurrent.futures
-import geojson
 import logging
 import queue
 import re
@@ -29,6 +28,7 @@
 from pathlib import Path
 from typing import Union
 
+import geojson
 import mercantile
 from cpuinfo import get_cpu_info
 from pmtiles.tile import (

osm_fieldwork/osmfile.py

@@ -200,7 +200,6 @@ def createWay(
         if 'refs' in way:
             for ref in way["refs"]:
                 osm += '\n    <nd ref="%s"/>' % ref
-
         if "tags" in way:
             for key, value in way["tags"].items():
                 if value is None:
@@ -211,7 +210,7 @@ def createWay(
                     newkey = escape(key)
                     newval = escape(str(value))
                     osm += f"\n    <tag k='{newkey}' v='{newval}'/>"
-            if modified and key != 'note':
+            if modified and key != "note":
                 osm += '\n    <tag k="note" v="Do not upload this without validation!"/>'
             osm += "\n"
 
@@ -301,7 +300,7 @@ def createNode(
                     newkey = escape(key)
                     newval = escape(str(value))
                     osm += f"\n    <tag k='{newkey}' v='{newval}'/>"
-            if modified and key != 'note':
+            if modified and key != "note":
                 osm += '\n    <tag k="note" v="Do not upload this without validation!"/>'
             osm += "\n  </node>\n"
         else: