Merge branch 'main' into cli-args

.github/workflows/build-test.yml

@@ -5,7 +5,6 @@ on:
     branches: [ main ]
   workflow_dispatch:
 
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true

.github/workflows/pypi-publish.yml

@@ -37,6 +37,6 @@ jobs:
       env:
         UV_PUBLISH_TOKEN: ${{ secrets.PYPI_TOKEN }}
       run: |
-        sed -i "s/0.0.0/${{ env.tag }}/g" kelp_o_matic/__init__.py pyproject.toml
+        sed -i "s/0.0.0/${{ env.tag }}/g" kelp_o_matic/__init__.py
         uv build
         uv publish

.github/workflows/test.yml

@@ -29,21 +29,20 @@ jobs:
           - "3.10"
     steps:
       - uses: actions/checkout@v4
-      - name: Setup python for test ${{ matrix.py }}
-        uses: actions/setup-python@v5
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
         with:
-          python-version: ${{ matrix.py }}
+          version: "0.5.26"
+          enable-cache: true
 
-      - name: Setup Poetry
-        uses: abatilo/actions-poetry@v2
+      - name: "Set up Python"
+        uses: actions/setup-python@v5
         with:
-          poetry-version: 1.6.1
+          python-version: ${{ matrix.py }}
 
       - name: Install dependencies
-        run: |
-          poetry update
-          poetry run pip install --upgrade setuptools
-          poetry install
+        run: uv sync --all-extras --dev
 
       - name: Run tests
-        run: poetry run pytest
+        run: uv run pytest

conda/recipe.yaml

@@ -21,7 +21,8 @@ build:
 requirements:
   host:
     - python >=3.10
-    - poetry-core
+    - uv
+    - hatch
     - pip
   run:
     - python >=3.10

pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "kelp-o-matic"
-version = "0.0.0"
+dynamic = ["version"]
 description = "Hakai Segment Tool for GeoTiff RPAS Imagery"
+readme = "README.md"
 authors = [{ name = "Taylor Denouden", email = "taylor.denouden@hakai.org" }]
 requires-python = ">=3.10, <3.14"
-readme = "README.md"
 license = "MIT"
 dependencies = [
     "numpy>=1.24.2",
@@ -46,6 +46,9 @@ include = ["kelp_o_matic"]
 [tool.hatch.build.targets.wheel]
 include = ["kelp_o_matic"]
 
+[tool.hatch.version]
+path = "kelp_o_matic/__init__.py"
+
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"