Add PyPi build and publish

Author: Patrick J. McNerthney

.github/workflows/ci.yaml

@@ -14,7 +14,8 @@ on:
 
 env:
   # Common versions
-  PYTHON_VERSION: '3.12.11' # TODO: Used?
+  PYTHON_VERSION: '3.13.7' # TODO: Used?
+  HATCH_VERSION: '1.12.0'
   DOCKER_BUILDX_VERSION: 'v0.26.1'
 
   # These environment variables are important to the Crossplane CLI install.sh
@@ -32,6 +33,9 @@ env:
   # XPKG: xpkg.upbound.io/${{ github.repository}}
   CROSSPLANE_REGORG: ghcr.io/${{ github.repository}}
 
+  # The PyPi project version to push. The default is v0.0.0+gitdate-gitsha.
+  PYPI_VERSION: ${{ inputs.version }}
+
   # The package version to push. The default is 0.0.0-gitsha.
   XPKG_VERSION: ${{ inputs.version }}
 
@@ -86,11 +90,49 @@ jobs:
         #remove-link-from-badge: false
         #unique-id-for-comment: python3.8
 
+  build-pypi:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+
+      - name: Setup Hatch
+        run: pipx install hatch==${{ env.HATCH_VERSION }}
+
+      # If a version wasn't explicitly passed as a workflow_dispatch input we
+      # default to version v0.0.0+<git-commit-date>-<git-short-sha>, for example
+      # v0.0.0+20231101115142-1091066df799. This is a simple implementation of
+      # Go's pseudo-versions: https://go.dev/ref/mod#pseudo-versions.
+      - name: Set Default PyPI Project Version
+        if: env.PYPI_VERSION == ''
+        run: echo "PYPI_VERSION=v0.0.0+$(date -d@$(git show -s --format=%ct) +%Y%m%d%H%M%S)-$(git rev-parse --short=12 HEAD)" >> $GITHUB_ENV
+
+      - name: Set PyPI Project Version
+        run: hatch version ${{ env.PYPI_VERSION }}
+
+      - name: Build Sdist and Wheel
+        run: hatch build
+
+      - name: Upload Sdist and Wheel to GitHub
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist
+          path: "dist/*"
+          if-no-files-found: error
+          retention-days: 1
+
   # We want to build most packages for the amd64 and arm64 architectures. To
   # speed this up we build single-platform packages in parallel. We then upload
   # those packages to GitHub as a build artifact. The push job downloads those
   # artifacts and pushes them as a single multi-platform package. 
-  build:
+  build-xpkg:
+    needs:
+      - build-pypi
     runs-on: ubuntu-24.04
     strategy:
       fail-fast: true
@@ -113,6 +155,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Download Sdist and Wheel from GitHub
+        uses: actions/download-artifact@v5
+        with:
+          name: dist
+          path: "dist"
+
       # We ask Docker to use GitHub Action's native caching support to speed up
       # the build, per https://docs.docker.com/build/cache/backends/gha/.
       - name: Build Runtime
@@ -142,16 +190,34 @@ jobs:
           if-no-files-found: error
           retention-days: 1
 
+  publish-pypi:
+    # Don't publish unless we were run with an explicit version.
+    if: ${{ inputs.version != '' }}
+    needs:
+      - build-pypi
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Download Sdist and Wheel from GitHub
+        uses: actions/download-artifact@v5
+        with:
+          name: dist
+          path: "dist"
+
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@v1.12.4
+        with:
+          password: ${{ secrets.PYPI_API_TOKEN }}
+
   # This job downloads the single-platform packages built by the build job, and
   # pushes them as a multi-platform package. We only push the package it the
   # XPKG_ACCESS_ID and XPKG_TOKEN secrets were provided.
-  push:
+  push-xpkg:
     runs-on: ubuntu-24.04
     permissions:
       contents: read
       packages: write
     needs:
-      - build
+      - build-xpkg
     steps:
       - name: Checkout
         uses: actions/checkout@v4

Dockerfile

@@ -1,17 +1,11 @@
 FROM python:3.13-slim-trixie AS image
 
-WORKDIR /root/pythonic
-COPY pyproject.toml /root/pythonic
-COPY crossplane /root/pythonic/crossplane
+COPY dist/*.whl /root
 WORKDIR /
 RUN \
   set -eux && \
-  cd /root/pythonic && \
-  pip install --root-user-action ignore --no-build-isolation setuptools==80.9.0 && \
-  pip install --root-user-action ignore --no-build-isolation . && \
-  pip uninstall --root-user-action ignore --yes setuptools && \
-  cd .. && \
-  rm -rf .cache pythonic && \
+  pip install --root-user-action ignore --no-build-isolation /root/*.whl && \
+  rm -rf /root/*.whl /root/.cache && \
   groupadd --gid 2000 pythonic && \
   useradd --uid 2000 --gid pythonic --home-dir /opt/pythonic --create-home --shell /usr/sbin/nologin pythonic
 

crossplane/pythonic/__init__.py

@@ -1,3 +1,6 @@
+# This is set at build time, using "hatch version"
+__version__ = '0.0.0'
+
 import base64
 
 from .composite import BaseComposite

crossplane/pythonic/function.py

@@ -220,30 +220,30 @@ async def run_function(self, request):
 
     def trimFullName(self, name):
         name = name.split('.')
-        ix = 0
         for values in (
-                ('request', 'response'),
-                ('observed', 'desired'),
-                ('resources', 'extra_resources'),
-                None,
-                ('resource', 'items'),
+                ('request', 'observed', 'resources', None, 'resource'),
+                ('request', 'extra_resources', None, 'items', 'resource'),
+                ('response', 'desired', 'resources', None, 'resource'),
         ):
-            if values:
-                if ix < len(name):
+            if len(values) <= len(name):
+                for ix, value in enumerate(values):
+                    if value and value != name[ix] and not name[ix].startswith(f"{value}["):
+                       break
+                else:
+                    ix = 0
                     for value in values:
-                        if name[ix] == value:
-                            del name[ix]
-                            break
-                        if name[ix].startswith(f"{value}["):
-                            if ix:
+                        if value:
+                            if value == name[ix]:
+                                del name[ix]
+                            elif ix:
                                 name[ix-1] += name[ix][len(value):]
                                 del name[ix]
                             else:
                                 name[ix] = name[ix][len(value):]
                                 ix += 1
-                            break
-            else:
-                ix += 1
+                        else:
+                            ix += 1
+                    break
         return '.'.join(name)
 
 

pyproject.toml

@@ -1,6 +1,5 @@
 [project]
 name = "crossplane-function-pythonic"
-version = "0.0.6"
 description = 'A Python centric Crossplane Function'
 readme = "README.md"
 requires-python = ">=3.11,<3.14"
@@ -21,14 +20,23 @@ dependencies = [
   "pyyaml==6.0.2",
 ]
 
+dynamic = ["version"]
+
 [project.urls]
 Documentation = "https://github.com/fortra/function-pythonic#readme"
 Issues = "https://github.com/fortra/function-pythonic/issues"
 Source = "https://github.com/fortra/function-pythonic"
 
-[tool.setuptools]
-packages = ["crossplane.pythonic"]
-py-modules = []
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+path = "crossplane/pythonic/__init__.py"
+validate-bump = false
+
+[tool.hatch.build.targets.wheel]
+packages = ["function"]
 
 [tool.hatch.envs.default]
 type = "virtual"