refactor: test pixi

It would be nice to have a consistent interface for Python.

Signed-off-by: vsoch <vsoch@users.noreply.github.com>

Author: vsoch

.github/workflows/test-build.yaml .github/deprecated/test-build.yaml.github/workflows/test-build.yaml renamed to .github/deprecated/test-build.yaml

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+here=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+FLUX_REPO=${1:-0}
+FLUX_BRANCH=${2:-3.11}
+
+echo "Flux Repo: ${FLUX_REPO}"
+echo "Flux Branch: ${FLUX_BRANCH}"
+        
+# Use default values if inputs are empty
+FLUX_REPO_URL=${FLUX_REPO:-"https://github.com/flux-framework/flux-core"}
+FLUX_BRANCH_NAME=${FLUX_BRANCH:-"master"}
+
+git clone -b ${FLUX_BRANCH_NAME} ${FLUX_REPO_URL} /tmp/flux-core
+mv /tmp/flux-core/src/bindings/python/flux ./flux        
+python setup.py sdist
+
+# I think ldconfig is Linux-specific
+sudo ldconfig || echo "Not running on Linux"

.github/scripts/build-bindings.sh

@@ -3,53 +3,14 @@
 # Exit on error, unset variable, or pipe failure
 set -euo pipefail
 
-# This will be empty for nightly test, and we will clone master branch
-FLUX_RELEASE_VERSION=${FLUX_RELEASE_VERSION:-0.78.0}
-FLUX_VERSION=${FLUX_VERSION:-0.78.0}
+# This must be set
+PYTHON_VERSION=${1:-py311}
 
-if [[ "$(uname)" == "Darwin" ]]; then
-  brew install \
-    autoconf \
-    automake \
-    libtool \
-    make \
-    pkg-config \
-    epoll-shim \
-    libev \
-    zeromq \
-    jansson \
-    lz4 \
-    libarchive \
-    hwloc \
-    sqlite \
-    lua \
-    luarocks \
-    cffi \
-    libyaml \
-    jq
-
-  # Possibility - install munge with MacPorts
-  # sudo port install munge
-  eval "$(/opt/homebrew/bin/brew shellenv)"
-
-  # Set the dynamic library path variable for macOS
-  export DYLD_LIBRARY_PATH=/usr/local/lib
-  
-  # Ensure we activate micromamabe that has a pinned version
-  PIP_INSTALL="/opt/conda/bin/python3 -m pip install"
-  ln -s $(which glibtoolize) /usr/local/bin/libtoolize
-  
-  CPPFLAGS="-I${HOMEBREW_PREFIX}/include/lua"
-  CPPFLAGS="-I$(brew --prefix libev)/include ${CPPFLAGS}"
-  CPPFLAGS="-I$(brew --prefix epoll-shim)/include/libepoll-shim ${CPPFLAGS}"
-  # LDFLAGS=-L${HOMEBREW_PREFIX}/lib
-  PKG_CONFIG_PATH=$(pkg-config --variable pc_path pkg-config)
-  PKG_CONFIG_PATH=$(brew --prefix libarchive)/lib/pkgconfig:${PKG_CONFIG_PATH}
-  PATH=$(brew --prefix libtool)/libexec/gnubin:$PATH
-  export LD_LIBRARY_PATH="/opt/conda/envs/build/lib:/opt/conda/envs/build/lib64"
-
-# Linux block!
-else
+# These will be empty for nightly test, and we will clone master branch
+FLUX_RELEASE_VERSION=${2:-0.78.0}
+FLUX_VERSION=${3:-0.78.0}
+
+if [[ "$(uname)" != "Darwin" ]]; then
   export DEBIAN_FRONTEND=noninteractive
   export TZ=UTC
   sudo ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ | sudo tee /etc/timezone
@@ -64,7 +25,6 @@ else
           libzmq3-dev \
           libczmq-dev \
           libjansson-dev \
-          libmunge-dev \
           libncursesw5-dev \
           lua5.3 \
           liblua5.3-dev \
@@ -76,8 +36,6 @@ else
           libs3-dev \
           libevent-dev \
           libarchive-dev \
-          python3-sphinx \
-          python3-cffi \
           libtool \
           git \
           build-essential \
@@ -86,53 +44,103 @@ else
   sudo rm -rf /var/lib/apt/lists/*
   sudo ldconfig
 
-  # Set the dynamic library path variable for Linux. The conda path is for the container.
-  export LD_LIBRARY_PATH=/usr/local/lib:/usr/lib:/opt/conda/envs/build/lib
+  # Set the dynamic library path variable for Linux.
+  export LD_LIBRARY_PATH=/usr/local/lib:/usr/lib
+  echo "LD_LIBRARY_PATH: ${LD_LIBRARY_PATH}"
 fi
 
-# Ensure we find micromamba environment first
-# mamba init commands are intolerable so let's do basics ourselves.
-PIP_INSTALL="/opt/conda/envs/build/bin/python3 -m pip install"
-export PATH="/opt/conda/envs/build/bin:$PATH"
-export PYTHONPATH=$(find /opt/conda/envs/build -name site-packages)
-export PYTHON=/opt/conda/envs/build/bin/python3
-export PYTHON_PREFIX=${PYTHONPATH}
-export PYTHON_EXEC_PREFIX=${PYTHONPATH}
-# export LIBS="-L/opt/conda/envs/build/lib:/opt/conda/envs/build/lib64"
-
 echo "Found Python $(which python3)"
-echo "PYTHONPATH: ${PATH}"
 echo "PATH: ${PATH}"
-echo "LD_LIBRARY_PATH: ${LD_LIBRARY_PATH}"
 
 # Here we can start common setup (we hope)
 echo "Flux Version for pypi is ${FLUX_VERSION}"
 if [[ "$(uname)" == "Darwin" ]]; then
+  PIXI_ROOT=/Users/runner/work/flux-python/flux-python/.pixi
+  PIXI_ENV=${PIXI_ROOT}/envs/${PYTHON_VERSION}
   sed -i '' "s/package_version = \"develop\"/package_version = \"$FLUX_VERSION\"/" setup.py
+  echo $(find /Users/runner/ -name python3) || echo $(find /Users/runner/ -name python)
+
+  # Tell where to look for lua.h
+  CPPFLAGS="-I${PIXI_ENV}/include"
+  
+  # This makes me want to kill homebrew and MacOS with fire.
+  # I know most of these aren't required. I can't remove them because of the ❤️‍🔥
+  export PYTHON_SITE_PACKAGES=$(find ${PIXI_ENV} -name site-packages)
+  export PYTHON_EXEC_PREFIX=${PYTHON_SITE_PACKAGES}
+  export PYTHON_SITE_PKG=${PYTHON_SITE_PACKAGES}
+  export PYTHON_PLATFORM_SITE_PKG=${PYTHON_SITE_PACKAGES}
+  export PYTHON_SITELIB=${PYTHON_SITE_PACKAGES}
+  export PYTHON_PREFIX=${PYTHON_SITE_PACKAGES}
+  export PKG_CONFIG_PATH=${PIXI_ENV}/lib/pkgconfig
+  export PYTHONDIR=${PYTHON_SITE_PACKAGES}
+  
+  # Set these to empty.
+  export PYTHON_EXTRA_LDFLAGS=" "
+  export PYTHON_EXTRA_LIBS=" "
+
+  echo "PKG_CONFIG_PATH: ${PKG_CONFIG_PATH}"
+  echo "PYTHON_PREFIX: ${PYTHON_PREFIX}"
+  echo "PYTHON_SITE_PACKAGES: ${PYTHON_SITE_PACKAGES}"
+  echo "PYTHON_EXEC_PREFIX: ${PYTHON_EXEC_PREFIX}"
 else
+  PIXI_ROOT=/home/runner/work/flux-python/flux-python/.pixi
+  export PIXI_ENV=${PIXI_ROOT}/envs/${PYTHON_VERSION}
   sed -i "s/package_version = \"develop\"/package_version = \"$FLUX_VERSION\"/" setup.py
+  CPPFLAGS="-I${PIXI_ENV}/include"
 fi
 
+# Can we remove need for setuptools?
+export PYTHON=${PIXI_ENV}/bin/python3
+export PYTHON_EXECUTABLE=${PIXI_ENV}/bin/python3
+export PYTHON_NOVERSIONCHECK=yes
+export LUA_CFLAGS="-I${PIXI_ENV}/include"
+export LDFLAGS="-L${PIXI_ENV}/lib -L${PIXI_ENV}/lib64" 
+echo "Found lua.h in:\n$(find ${PIXI_ROOT} -name lua.h)" || echo "Did not find lua.h"
+
 # Store current directory
 here=$(pwd)
+luarocks install luaposix
 
-# Install Python requirements using the OS-specific pip command - allow for ubuntu to be 24.04 or not.
-# I like how "--break-system-packages" is analogous with --i-acknowledge-i-am-a-terrible-person
+# Flux Security --
+# Does not have a variant for Mac
 if [[ "$(uname)" == "Darwin" ]]; then
-  echo "Installing python requirements for MacOS"
-  ${PIP_INSTALL} IPython setuptools ply sphinx cffi pyyaml
-  ${PIP_INSTALL} -r .github/scripts/requirements-dev.txt
+  
+  LIBSODIUM_VERSION="1.0.20"
+  ZMQ_VERSION="4.3.5"
+
+  curl -L "https://github.com/jedisct1/libsodium/archive/refs/tags/${LIBSODIUM_VERSION}-RELEASE.tar.gz" -o libsodium.tar.gz
+  tar -xf libsodium.tar.gz
+  cd "libsodium-${LIBSODIUM_VERSION}-RELEASE"
+  ./configure --prefix=${PIXI_ENV}
+  make -j
+  sudo make install
+  cd ..
+
+
+  curl -L "https://github.com/zeromq/libzmq/releases/download/v${ZMQ_VERSION}/zeromq-${ZMQ_VERSION}.tar.gz" -o zeromq.tar.gz
+  tar -xf zeromq.tar.gz
+  cd "zeromq-${ZMQ_VERSION}"
+  CFLAGS="-Wno-missing-braces" CXXFLAGS="-Wno-missing-braces" ./configure --prefix=${PIXI_ENV} --with-libsodium
+  make -j
+  sudo make install
+  cd ..  
+
 else
-  echo "Installing python requirements for Linux"
-  ${PIP_INSTALL} IPython pyyaml || ${PIP_INSTALL} IPython --break-system-packages pyyaml
-  ${PIP_INSTALL} -r .github/scripts/requirements-dev.txt || ${PIP_INSTALL} -r .github/scripts/requirements-dev.txt --break-system-packages
 
-  # Flux Security --
-  # Does not have a variant for Mac
+  # Install munge and libmunge
+  MUNGE_VERSION="0.5.16"
+  curl -L "https://github.com/dun/munge/releases/download/munge-${MUNGE_VERSION}/munge-${MUNGE_VERSION}.tar.xz" -o munge.tar.xz
+  tar -xf munge.tar.xz
+  cd "munge-${MUNGE_VERSION}"
+  ./configure --prefix=/usr
+  make
+  sudo make install
+  cd ..
+
   git clone https://github.com/flux-framework/flux-security ~/security
   cd ~/security
   ./autogen.sh
-  PYTHON_PREFIX=PYTHON_EXEC_PREFIX=${PYTHON_PREFIX} PYTHON=/opt/conda/bin/python3 ./configure --prefix=/usr/local
+  ./configure --prefix=/usr/local
   make
   sudo make install
   sudo ldconfig
@@ -149,11 +157,12 @@ chmod +x etc/gen-cmdhelp.py
 ./autogen.sh || echo "No autogen here"
 
 if [[ "$(uname)" == "Darwin" ]]; then
-  CPPFLAGS="$CPPFLAGS" PKG_CONFIG_PATH=$PKG_CONFIG_PATH ./configure --prefix=/usr/local
+  CPPFLAGS="$CPPFLAGS" CFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS} -lzmq -lsodium" PKG_CONFIG_PATH=$PKG_CONFIG_PATH ./configure --prefix=/usr/local || (cp ./config.log ../ && exit 1)
   ls ./scripts
-  ./scripts/check-macos.sh || echo "No check-macos.sh"
+  ./scripts/check-macos.sh || (cp ./config.log ../ && exit 1)
 else
-  ./configure --prefix=/usr/local
+  ./configure CPPFLAGS="$CPPFLAGS" CFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" --prefix=/usr/local
+  cp ./config.log ../
   make VERBOSE=1
   sudo make install || true
   sudo make install

.github/scripts/setup.sh

@@ -28,52 +28,29 @@ jobs:
       matrix:
         # The matrix now includes both os and python
         os: [ubuntu-latest, macos-latest]
-        python: ["3.8", "3.9", "3.10", "3.11"]
+        python: ["py38", "py39", "py310", "py311", "py312"]
 
     steps:
     - uses: actions/checkout@v4
-    - name: Setup Python
-      env:
-        python_version: ${{ matrix.python }}
-      run: /bin/bash ./docker/install-mamba.sh ${{ matrix.python }}
+    - uses: prefix-dev/setup-pixi@v0.9.0
+      with:
+        environments: ${{ matrix.python }}
 
-    # The login shell ensures the mamba env is active
     - name: Build Flux Core Branch
-      env:
-        FLUX_RELEASE_VERSION: ${{ inputs.release_version }}
-        FLUX_VERSION: ${{ inputs.version }}
-      run: /bin/bash .github/scripts/setup.sh
-
-    - name: Build Python Bindings
-      shell: bash -l {0}
-      env:
-        FLUX_BRANCH: ${{ inputs.branch }}
-        FLUX_REPO: ${{ inputs.repo }}
-      run: |
-        echo "Flux Repo: ${{ inputs.repo }}"
-        echo "Flux Branch: ${{ inputs.branch }}"
-        
-        # Use default values if inputs are empty
-        FLUX_REPO_URL=${FLUX_REPO:-"https://github.com/flux-framework/flux-core"}
-        FLUX_BRANCH_NAME=${FLUX_BRANCH:-"master"}
+      run: pixi run -e ${{ matrix.python }} bash .github/scripts/setup.sh ${{ matrix.python }} ${{ inputs.release_version }} ${{ inputs.version }}
 
-        git clone -b ${FLUX_BRANCH_NAME} ${FLUX_REPO_URL} /tmp/flux-core
-        mv /tmp/flux-core/src/bindings/python/flux ./flux        
-        python setup.py sdist
+    - name: Upload logs on failure
+      if: ${{ always() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: config-log-${{ matrix.python }}-${{ matrix.os }}
+        path: ./config.log
 
-        # I think ldconfig is Linux-specific
-        if [[ "${{ runner.os }}" == "Linux" ]]; then
-          sudo ldconfig
-        fi
+    - name: Build Python Bindings
+      run: pixi run -e ${{ matrix.python }} bash .github/scripts/build-bindings.sh ${{ inputs.branch }} ${{ inputs.repo }}
 
     - name: Build Python Wheels
-      shell: bash -l {0}
-      env:
-        build_number: ${{ inputs.rc }}
-        python_version: ${{ matrix.python }}
-      run: |
-        /bin/bash ./docker/build-wheels.sh ${{ env.build_number }} ${{ env.python_version }}
-        ls ./dist
+      run: pixi run -e ${{ matrix.python }} bash ./docker/build-wheels.sh ${{ env.build_number }} ${{ env.python_version }}
 
     - name: Upload distributions
       uses: actions/upload-artifact@v4

.github/workflows/build-release.yaml

@@ -121,12 +121,9 @@ $ python3 setup.py sdist
 $ python3 setup.py sdist bdist_wheel
 ```
 
-You can build versions of the Python wheels across 3.6 to 3.10 like:
+Given an environment with dependencies, you can build versions of the Python wheels across 3.6 to 3.12 like:
 
 ```bash
-# only need to run this once in the container
-/bin/bash ./docker/install-mamba.sh
-
 # And this to install the current Flux + version in setup.py as a wheel
 # The number is the build number
 /bin/bash ./docker/build-wheels.sh 2

README.md

@@ -7,12 +7,7 @@ version=${2:-3.11}
 # This is intended to run in the container
 echo "Building Python version ${version}"
 
-export PATH=/opt/conda/envs/build/bin:$PATH
-export PYTHONPATH=/opt/conda/envs/build/lib/python${version}/site-packages
-
-/opt/conda/bin/mamba activate build || true
-
 # Build the bindings for this python version!
-/opt/conda/envs/build/bin/python3 setup.py sdist
-/opt/conda/envs/build/bin/python3 setup.py bdist_wheel --plat-name=any --build-number=${build_number}
-unset PYTHONPATH
+python3 setup.py sdist
+python3 setup.py bdist_wheel --plat-name=any --build-number=${build_number}
+ls ./dist

docker/build-wheels.sh

@@ -0,0 +1,57 @@
+[workspace]
+name = "flux-python"
+channels = ["conda-forge"]
+platforms = ["linux-64", "osx-arm64"]
+
+[dependencies]
+python = ">=3.8"
+pip = "*"
+
+[feature.py38.dependencies]
+python = "3.8.*"
+[feature.py39.dependencies]
+python = "3.9.*"
+[feature.py310.dependencies]
+python = "3.10.*"
+[feature.py311.dependencies]
+python = "3.11.*"
+[feature.py312.dependencies]
+python = "3.12.*"
+
+[feature.common.dependencies]
+cffi = "*"
+pyyaml = "*"
+jsonschema = "*"
+docutils = "*"
+ply = "*"
+black = "*"
+ipython = "*"
+wheel = "*"
+setuptools = "*"
+luarocks = "*"
+lua = "*"
+lua-lpeg = "*"
+libev = "*"
+sphinx = "*"
+libarchive = "*"
+autoconf = "*"
+automake = "*"
+libtool = "*"
+make = "*"
+pkg-config = "*"
+zeromq = "*"
+jansson = "*"
+libhwloc = "*"
+libsodium = "*"
+argp-standalone = "*"
+
+[pypi-dependencies]
+setuptools = "*"
+
+[environments]
+py38 = { features = ["py38", "common"] }
+py39 = { features = ["py39", "common"] }
+py310 = { features = ["py310", "common"] }
+py311 = { features = ["py311", "common"] }
+py312 = { features = ["py312", "common"] }
+