Merge branch 'main' of github.com:hotosm/osm-rawdata

SYn with upstream.

.github/workflows/build-ci.yml

@@ -0,0 +1,54 @@
+name: Build CI Img
+
+on:
+  # Push includes PR merge
+  push:
+    branches:
+      - main
+    paths:
+      # Workflow is triggered only if deps change
+      - "pyproject.toml"
+      - "Dockerfile"
+  # Allow manual trigger
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  GIT_BRANCH: ${{ github.ref_name }}
+
+jobs:
+  build-and-push-images:
+    runs-on: ubuntu-latest
+    environment:
+      name: ${{ github.ref_name }}
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract version
+        id: extract_api_version
+        run: |
+          echo "PKG_VERSION=$(python -c 'from osm_rawdata.__version__ import __version__; print(__version__)')" >> $GITHUB_ENV
+
+      - name: Build image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          target: ci
+          push: true
+          tags: |
+            "ghcr.io/hotosm/osm-rawdata:${{ env.PKG_VERSION }}-ci"
+            "ghcr.io/hotosm/osm-rawdata:ci"
+          build-args: |
+            PKG_VERSION=${{ env.PKG_VERSION }}

.github/workflows/build.yml

@@ -1,13 +1,8 @@
-name: Build and Deploy
+name: Build
 
 on:
-  # Push includes PR merge
-  push:
-    branches:
-      - main
-    paths:
-      # Workflow is triggered only if src changes
-      - "src/**"
+  release:
+    types: [published]
   # Allow manual trigger
   workflow_dispatch:
 
@@ -38,8 +33,7 @@ jobs:
       - name: Extract version
         id: extract_api_version
         run: |
-          cd src/backend
-          echo "PKG_VERSION=$(python -c 'from app.__version__ import __version__; print(__version__)')" >> $GITHUB_ENV
+          echo "PKG_VERSION=$(python -c 'from osm_rawdata.__version__ import __version__; print(__version__)')" >> $GITHUB_ENV
 
       - name: Build image
         uses: docker/build-push-action@v4
@@ -48,7 +42,7 @@ jobs:
           target: prod
           push: true
           tags: |
-            "ghcr.io/hotosm/fmtm/osm-fieldwork:${{ env.PKG_VERSION }}"
-            "ghcr.io/hotosm/fmtm/osm-fieldwork:latest"
+            "ghcr.io/hotosm/osm-rawdata:${{ env.PKG_VERSION }}"
+            "ghcr.io/hotosm/osm-rawdata:latest"
           build-args: |
             PKG_VERSION=${{ env.PKG_VERSION }}

.gitignore

@@ -53,12 +53,14 @@ NEWS
 *.app
 
 # PDM
-.pdm.toml
+pdm.toml
 .pdm-python
+__pypackages__
 
 # Python builds
 build
 dist
 
 # Docs
 site
+.cache

README.md

@@ -34,13 +34,13 @@ To install osm-rawdata, you can use pip. Here are two options:
 Run a specific command:
 
 ```bash
-docker run --rm -v $PWD:/data ghcr.io/hotosm/osm-rawdata:0.1.0 osm-rawdata
+docker run --rm -v $PWD:/data ghcr.io/hotosm/osm-rawdata:latest geofabrik <flags>
 ```
 
 Run interactively (to use multiple commands):
 
 ```bash
-docker run --rm -it -v $PWD:/data ghcr.io/hotosm/osm-rawdata:0.1.0
+docker run --rm -it -v $PWD:/data ghcr.io/hotosm/osm-rawdata:latest
 ```
 
 > Note: the output directory should always be /data/... to persist data.

pyproject.toml

@@ -52,7 +52,6 @@ version = "0.1.0"
 version_files = [
     "pyproject.toml:version",
     "osm_rawdata/__version__.py",
-    "build_imgs.sh:PKG_VERSION",
 ]
 
 [tool.pdm]