udpate actions and make

Author: Colin Hill

.github/workflows/pypi_publish.yml

@@ -6,29 +6,19 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  publish-pypi:
     runs-on: ubuntu-latest
     environment: release
     permissions:
       contents: read
       id-token: write
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
-          cache: 'pip'
-      - name: Set up Pixi
-        uses: prefix-dev/setup-pixi@v0.8.1
-        with:
-          pixi-version: v0.39.5
-          cache: true
-          auth-host: prefix.dev
-          auth-token: ${{ secrets.PREFIX_DEV_TOKEN }}
-      - name: Install Hatch
-        run: pip install hatch
+          enable-cache: true
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
       - name: Build package
-        run: hatch build
+        run: make build
       - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        run: uv publish --index pypi

.github/workflows/test_pypi_publish.yml

@@ -6,31 +6,19 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  publish-test-pypi:
     runs-on: ubuntu-latest
     environment: release
     permissions:
       contents: read
       id-token: write
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
-          cache: 'pip'
-      - name: Set up Pixi
-        uses: prefix-dev/setup-pixi@v0.8.1
-        with:
-          pixi-version: v0.39.5
-          cache: true
-          auth-host: prefix.dev
-          auth-token: ${{ secrets.PREFIX_DEV_TOKEN }}
-      - name: Install Hatch
-        run: pip install hatch
+          enable-cache: true
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
       - name: Build package
-        run: hatch build
+        run: make build
       - name: Publish to TestPyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          repository-url: https://test.pypi.org/legacy/
+        run: uv publish --index testpypi

Makefile

@@ -1,11 +1,3 @@
-# lint:
-# 	poetry run ruff check terrapyn/ tests/ --extend-ignore=D1,D2,D4,TID
-
-# .PHONY: test
-# # Ignore earth engine directory 'ee'
-# test:
-# 	pytest --doctest-modules --cov=terrapyn --cov-branch --cov-report term-missing  -vv --color=yes --ignore=terrapyn/ee
-
 .PHONY: help build format lint sync lock test upgrade all 
 
 help:
@@ -20,7 +12,7 @@ help:
 	@echo "  all      - Run lock, sync, format, lint, and test"
 
 build:
-	uv build
+	uv run hatch build
 
 format:
 	uv run ruff format terrapyn/ tests/

README.md

@@ -26,22 +26,19 @@ If you already have Python version `3.10` or later you can skip this step.
 
 ### Install
 
-#### Via Pip
 The package can be installed in an existing Python environment via pip:
 
 ```bash
 pip install terrapyn
 ```
 
-#### From Source
-Clone the repo and install the package:
+Or the repo can be cloned from source:
 
 ```bash
 git clone https://github.com/colinahill/terrapyn.git && cd terrapyn
 ```
 
-This project uses [Pixi](https://pixi.sh/) to manage dependencies, which should be installed first. Then, install the package with
+## Development
+This project uses [Astral uv](https://docs.astral.sh/uv/) to manage dependencies, which should be installed first. Then the environment is created with `uv venv`.
 
-```bash
-pixi install
-```
+A `Makefile` contains most/all of the required tools for code quality, testing and publishing. Run `make help` to see available commands.

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "terrapyn"
-version = "0.1.8"
+version = "0.2.0"
 description = "Toolkit to manipulate Earth observations and models."
 authors = [{name = "Colin Hill", email = "colinalastairhill@gmail.com"}]
 readme = "README.md"
@@ -62,6 +62,18 @@ exclude = [
 [tool.hatch.version]
 path = "pyproject.toml"
 
+[[tool.uv.index]]
+name = "pypi"
+url = "https://pypi.org/simple/"
+publish-url = "https://upload.pypi.org/legacy/"
+explicit = true
+
+[[tool.uv.index]]
+name = "testpypi"
+url = "https://test.pypi.org/simple/"
+publish-url = "https://test.pypi.org/legacy/"
+explicit = true
+
 [tool.ruff]
 line-length = 120
 target-version = "py312"
@@ -98,8 +110,8 @@ convention = "google"
 
 [dependency-groups]
 dev = [
-    "coverage-badge>=1.1.2",
     "freezegun>=1.5.5",
+    "hatch>=1.14.1",
     "pre-commit>=4.3.0",
     "pytest>=8.4.1",
     "pytest-cov>=6.2.1",