Merge pull request #221 from UW-Macrostrat/uv

Migrate package management to uv

Author: davenquinn

.github/workflows/build-api-dev.yaml

@@ -1,11 +1,11 @@
-name: Build Production
-
+name: API v3 build
 on:
   push:
     branches:
       - main
     tags:
-      - v[0-9]+.[0-9]+.[0-9]+  # Semver Release
+      - api-v3-v[0-9]+.[0-9]+.[0-9]+  # Semver Release
+      - api-v3-v[0-9]+.[0-9]+.[0-9]+-**  # Semver Pre-Release
     paths:
       - services/api-v3/**
 
@@ -17,6 +17,11 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: 'recursive'
+      - name: Get the version from the tag, if it exists
+        run: |
+          TAG=${{ github.ref_name }}
+          VERSION=$(echo "${TAG}" | sed -E 's/tileserver-v//')
+          echo "VERSION=${VERSION}" >> $GITHUB_ENV
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
@@ -25,17 +30,10 @@ jobs:
           tags: |
             type=ref,event=pr,suffix=-{{date 'YYYYMMDDHHmmss'}}
             type=ref,event=branch,suffix=-{{date 'YYYYMMDDHHmmss'}}
-            type=semver,pattern={{version}}
             type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=main-{{date 'YYYYMMDDHHmmss'}},enable={{is_default_branch}}
             type=raw,value=sha-{{sha}}
-            
-            # When a PRODUCTION tag (vX.Y.Z) is pushed → also tag staging and dev
-            type=raw,value=main-{{date 'YYYYMMDDHHmmss'}},enable=${{ startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-') }}
-            type=semver,pattern={{version}},suffix=-beta.{{date 'YYYYMMDDHHmmss'}},enable=${{ startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-') }}
-            type=semver,pattern={{version}},suffix=-beta,enable=${{ startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-') }}
-
-            # When a STAGING prerelease tag (vX.Y.Z-*) is pushed → also tag dev
-            type=raw,value=main-{{date 'YYYYMMDDHHmmss'}},enable=${{ startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '-') }}
+            type=raw,value=${{ env.VERSION }},enable=${{ env.VERSION != '' }}
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Login to OSG DockerHub
@@ -48,8 +46,21 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: services/api-v3
+          build-contexts: |
+            py-modules=./py-modules
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+      # Add a link to the built artifact to the workflow summary
+      - name: Add link to workflow summary
+        run: |
+            echo "## Docker Image Built" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "The Docker image has been built and pushed to [OSG Harbor](https://hub.opensciencegrid.org/harbor/projects/887/repositories/api-v3/artifacts-tab/artifacts/sha256:${{ github.sha }})" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "### Tags:" >> $GITHUB_STEP_SUMMARY
+            for tag in ${{ steps.meta.outputs.tags }}; do
+            echo "- \`$tag\`" >> $GITHUB_STEP_SUMMARY
+            done

.github/workflows/build-api-prod.yaml .github/workflows/build-api-v3.yaml.github/workflows/build-api-prod.yaml renamed to .github/workflows/build-api-v3.yaml

@@ -5,36 +5,31 @@ on:
     branches: ["main"]
     paths:
       - services/legacy-tileserver/**
+      - py-modules/tileserver-utils/**
     tags:
       - legacy-tileserver-v[0-9]+.[0-9]+.[0-9]+ # Semver Release (non-prerelease)
       - legacy-tileserver-v[0-9]+.[0-9]+.[0-9]+-** # Semver release (prerelease)
   pull_request:
     branches: [main]
     paths:
       - services/legacy-tileserver/**
+      - py-modules/tileserver-utils/**
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: "recursive"
       # Set up python and poetry
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.11
-      - name: Install Poetry
-        run: python3 -m pip install poetry==2.1.1
-      - name: Build and stage local packages
-        run: scripts/prepare-services
       - name: Get the version from the tag, if it exists
         run: |
           TAG=${{ github.ref_name }}
           VERSION=$(echo "${TAG}" | sed -E 's/legacy-tileserver-v//')
           echo "VERSION=${VERSION}" >> $GITHUB_ENV
-      - name: Docker meta
+
+      - name: Docker metadata
         id: meta
         uses: docker/metadata-action@v4
         with:
@@ -44,16 +39,8 @@ jobs:
             type=ref,event=pr,suffix=-{{date 'YYYYMMDDHHmmss'}}
             type=ref,event=branch,suffix=-{{date 'YYYYMMDDHHmmss'}}
             type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=main-{{date 'YYYYMMDDHHmmss'}},enable={{is_default_branch}}
             type=raw,value=sha-{{sha}}
-            
-            
-            # When a PRODUCTION tag (legacy-tileserver-vX.Y.Z) → also tag staging and dev
-            type=raw,value=main-{{date 'YYYYMMDDHHmmss'}},enable=${{ startsWith(github.ref, 'refs/tags/legacy-tileserver-v') && !contains(env.VERSION, '-') }}
-            type=raw,value=${{ env.VERSION }}-beta.{{date 'YYYYMMDDHHmmss'}},enable=${{ startsWith(github.ref, 'refs/tags/legacy-tileserver-v') && !contains(env.VERSION, '-') }}
-            type=raw,value=${{ env.VERSION }}-beta,enable=${{ startsWith(github.ref, 'refs/tags/legacy-tileserver-v') && !contains(env.VERSION, '-') }}
-
-            # When a STAGING prerelease tag (legacy-tileserver-vX.Y.Z-*) → also tag dev
-            type=raw,value=main-{{date 'YYYYMMDDHHmmss'}},enable=${{ startsWith(github.ref, 'refs/tags/legacy-tileserver-v') && contains(env.VERSION, '-') }}
 
       - name: Set up Docker BuildX
         uses: docker/setup-buildx-action@v2
@@ -67,6 +54,8 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: services/legacy-tileserver
+          build-contexts: |
+            py-modules=./py-modules
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build-legacy-tileserver.yaml

@@ -5,30 +5,24 @@ on:
     branches: ["main"]
     paths:
       - services/tileserver/**
+      - py-modules/tileserver-utils/**
     tags:
       - tileserver-v[0-9]+.[0-9]+.[0-9]+ # Semver Release (non-prerelease)
       - tileserver-v[0-9]+.[0-9]+.[0-9]+-** # Semver release (prerelease)
   pull_request:
     branches: [main]
     paths:
       - services/tileserver/**
+      - py-modules/tileserver-utils/**
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: "recursive"
-      # Set up python and poetry
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.11
-      - name: Install Poetry
-        run: python3 -m pip install poetry==2.1.1
-      - name: Build and stage local packages
-        run: scripts/prepare-services
+
       - name: Get the version from the tag, if it exists
         run: |
           TAG=${{ github.ref_name }}
@@ -45,15 +39,15 @@ jobs:
             type=raw,value=${{ env.VERSION }},enable=${{ env.VERSION != '' }}
             type=raw,value=latest,enable={{is_default_branch}}
             type=raw,value=sha-{{sha}}
-      
+
             # When a PRODUCTION tag (tileserver-vX.Y.Z) → also tag staging and dev
             type=raw,value=main-{{date 'YYYYMMDDHHmmss'}},enable=${{ startsWith(github.ref, 'refs/tags/tileserver-v') && !contains(env.VERSION, '-') }}
             type=raw,value=${{ env.VERSION }}-beta.{{date 'YYYYMMDDHHmmss'}},enable=${{ startsWith(github.ref, 'refs/tags/tileserver-v') && !contains(env.VERSION, '-') }}
             type=raw,value=${{ env.VERSION }}-beta,enable=${{ startsWith(github.ref, 'refs/tags/tileserver-v') && !contains(env.VERSION, '-') }}
-      
+
             # When a STAGING prerelease tag (tileserver-vX.Y.Z-*) → also tag dev
             type=raw,value=main-{{date 'YYYYMMDDHHmmss'}},enable=${{ startsWith(github.ref, 'refs/tags/tileserver-v') && contains(env.VERSION, '-') }}
-                  
+
 
       - name: Set up Docker BuildX
         uses: docker/setup-buildx-action@v2
@@ -67,6 +61,8 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: services/tileserver
+          build-contexts: |
+            py-modules=./py-modules
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build-tileserver.yaml

@@ -1,33 +1,33 @@
 name: Format code and sort imports
 on:
   pull_request:
-    branches: [main]
+    branches: [ main ]
   push:
-    branches: [main]
+    branches: [ main ]
 jobs:
   format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
-          ref: ${{ github.head_ref }}
-      - uses: actions/[email protected]
+          submodules: recursive
+
+      - name: "Set up Python"
+        uses: actions/setup-python@v6
         with:
-          python-version: '^3.11'
-      - uses: actions/cache@v4
+          python-version-file: "pyproject.toml"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
         with:
-          path: |
-            ~/.cache/pypoetry
-            ~/.virtualenvs
-          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-poetry-
-      - name: Install Poetry
-        run: curl -sSL https://install.python-poetry.org | python3 -
+          enable-cache: true
+
       - name: Install dependencies
-        run: poetry install --only dev
+        run: uv sync --only-dev
+
       - name: Run formatting commands
         run: make format
+
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v5
         with:

.github/workflows/format-code.yml

@@ -11,15 +11,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         submodules: recursive
 
-    - name: Set up Python and Poetry
-      uses: abatilo/actions-poetry@v2
+    - name: "Set up Python"
+      uses: actions/setup-python@v6
+      with:
+        python-version-file: "pyproject.toml"
+
+    - name: Install uv
+      uses: astral-sh/setup-uv@v6
       with:
-        poetry-version: "1.8.2"
+        enable-cache: true
 
     - name: Install system dependencies (GDAL)
       run: |

.github/workflows/run-tests.yml

@@ -1,35 +1,34 @@
 all:
-	poetry lock
-	poetry install --with=dev,gis
-	# This breaks on fresh installs, not sure
-	#./bin/macrostrat poetry run mono install
-	# Install the version of the GDAL bindings that matches the native lib.
-	# This is breakable and should be replaced with a more robust solution.
-	poetry run pip install GDAL==$(shell gdal-config --version | sed 's/\([0-9]*\)\.\([0-9]*\).*/\1.\2/')
+	# Install all dependencies
+	# Install all optional dependency groups (dev, gis, etc)
+	uv sync
+
+gis:
+	# Install GIS dependencies
+	uv pip install "GDAL==$(shell gdal-config --version)"
+	uv sync --group gis
 
 install:
 	ln -sf $(shell pwd)/bin/macrostrat /usr/local/bin/macrostrat
 
 format:
-	poetry run black .
-	poetry run isort .
+	uv run black .
+	uv run isort .
 
 test:
 	# These tests may fail due to an older GDAL version in use.
 	# We need to figure out how to bundle GDAL or run in a Docker context
-	poetry run macrostrat test all --skip-env -x -s
-	#	poetry run pytest -s -x \
-	#		--ignore=runtime-tests \
-	#		--ignore=services \
-	#		--ignore=v2-transition \
-	#		--ignore=submodules \
-	#		--skip-env \
-	#		.
+	uv run macrostrat test all --skip-env -x -s
 
 test-ci:
 	# We need a fairly recent version of GDAL (3.10) for map integration tests to pass.
 	# For now, we avoid running these tests in CI.
-	poetry run macrostrat test all --skip-env -x -s -m "not requires_gdal"
+	uv run macrostrat test all --skip-env -x -s -m "not requires_gdal"
 
 test-warnings:
-	poetry run pytest cli/tests -W error
+	uv run pytest cli/tests -W error
+
+reset:
+	# Remove all virtual environments in subdirectories and re-create the main one
+	find . -name ".venv" -type d -exec rm -rf {} +
+	make all