Merge pull request #58 from dimagi/gh/upgrade-build-tools

Upgrade build tools (pyproject.toml, pyverno, uv)

Author: gherceg

.github/workflows/pypi.yml

@@ -0,0 +1,68 @@
+name: Publish Python distribution to PyPI and TestPyPI
+# Source:
+# https://packaging.python.org/en/latest/guides/publishing-package-distribution-releases-using-github-actions-ci-cd-workflows/
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - 'v*'
+  workflow_dispatch:
+jobs:
+  build:
+    name: Build distribution package
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v6
+        with:
+          version: '>=0.7'
+      - name: Check for version match in git tag and couchdb_cluster_admin.__version__
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: uvx pyverno check couchdb_cluster_admin/__init__.py "${{ github.ref }}"
+      - name: Add untagged version suffix
+        if: ${{ ! startsWith(github.ref, 'refs/tags/v') }}
+        run: uvx pyverno update couchdb_cluster_admin/__init__.py
+      - name: Build a binary wheel and a source tarball
+        run: uv build
+      - name: Store the distribution packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: python-package-distributions
+          path: dist/
+  pypi-publish:
+    name: Upload release to PyPI
+    needs: [build]
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/couchdb-cluster-admin
+    permissions:
+      id-token: write
+    steps:
+      - name: Download all the dists
+        uses: actions/download-artifact@v4
+        with:
+          name: python-package-distributions
+          path: dist/
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+  pypi-test-publish:
+    name: Upload release to test PyPI
+    needs: [build]
+    runs-on: ubuntu-latest
+    environment:
+      name: testpypi
+      url: https://test.pypi.org/p/couchdb-cluster-admin
+    permissions:
+      id-token: write
+    steps:
+      - name: Download all the dists
+        uses: actions/download-artifact@v4
+        with:
+          name: python-package-distributions
+          path: dist/
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/

.github/workflows/tests.yml

@@ -11,24 +11,20 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         python-version: ["3.10"]    # dimagi-memoized does not yet support later versions of python
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+    - uses: actions/checkout@v4
+    - uses: astral-sh/setup-uv@v6
       with:
-        python-version: ${{ matrix.python-version }}
+        version: '>=0.7'
+        python-version: ${{ matrix.python }}
     - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install -r requirements.txt
-        python -m pip install -r test-requirements.txt
+      run: uv sync --locked
     - name: Make data directory if needed
       run: |
         mkdir -p /home/runner/work/couchdb-cluster-admin/couchdb-cluster-admin/data
@@ -37,5 +33,4 @@ jobs:
         docker build -t couchdb-cluster - < docker-couchdb-cluster/Dockerfile
         docker run -d --name couchdb-cluster -v $(pwd)/data:/usr/src/couchdb/dev/lib/ -p 15984:15984 -p 15986:15986 -p 25984:25984 -p 25986:25986 -p 35984:35984 -p 35986:35986 -p 45984:45984 -p 45986:45986 -t couchdb-cluster --with-admin-party-please -n 4
     - name: Run tests
-      run: |
-        pytest tests.py
+      run: .venv/bin/pytest tests.py

pyproject.toml

@@ -0,0 +1,54 @@
+[project]
+name = "couchdb-cluster-admin"
+description = "Utility for managing multi-node couchdb clusters"
+authors = [{name = "Dimagi", email = "[email protected]"}]
+license = {file = "LICENSE"}
+readme = {file = "README.md", content-type = "text/markdown"}
+dynamic = ["version"]
+requires-python = ">= 3.10"
+classifiers = [
+    'Development Status :: 3 - Alpha',
+    'Environment :: Web Environment',
+    'Intended Audience :: Developers',
+    'License :: OSI Approved :: BSD License',
+    'Operating System :: OS Independent',
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    'Topic :: Software Development :: Libraries :: Python Modules',
+]
+dependencies = [
+    'argparse>=1.4',
+    'dimagi-memoized',
+    'gevent',
+    'jsonobject',
+    'PyYAML',
+    'requests',
+]
+
+[dependency-groups]
+dev = [
+    'mock',
+    'pytest',
+]
+
+[project.urls]
+Home = "https://github.com/dimagi/couchdb-cluster-admin"
+
+[build-system]
+requires = [
+    "setuptools>=75",
+]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools]
+packages = ["couchdb_cluster_admin"]
+
+[tool.setuptools.dynamic]
+version = {attr = "couchdb_cluster_admin.__version__"}
+
+[tool.distutils.bdist_wheel]
+universal = true
+
+[tool.flake8]
+exclude = "./build"