Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/scripts/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
cffi>=1.1
ply>=3.9
pyyaml
jsonschema
docutils
Expand Down
19 changes: 11 additions & 8 deletions .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ on:
description: 'Release candidate to build (for wheel)'
default: "0"
branch:
description: 'Branch to build from'
default: "master"
description: 'Branch or tag to build from (defaults to v<release_version>)'
default: ""
repo:
description: 'Repository to build from'
default: "https://github.com/flux-framework/flux-core"
Expand Down Expand Up @@ -65,16 +65,18 @@ jobs:
env:
FLUX_BRANCH: ${{ inputs.branch }}
FLUX_REPO: ${{ inputs.repo }}
FLUX_RELEASE_VERSION: ${{ inputs.release_version || '0.88.0' }}
shell: bash
run: |
echo "Flux Repo: ${FLUX_REPO}"
echo "Flux Branch: ${FLUX_BRANCH}"
if [[ "${FLUX_REPO}" == "" ]]; then
FLUX_REPO="https://github.com/flux-framework/flux-core"
fi
# Match the bindings to the release that libflux was built from
if [[ "${FLUX_BRANCH}" == "" ]]; then
FLUX_BRANCH="master"
FLUX_BRANCH="v${FLUX_RELEASE_VERSION}"
fi
echo "Flux Repo: ${FLUX_REPO}"
echo "Flux Branch: ${FLUX_BRANCH}"
git clone -b ${FLUX_BRANCH} ${FLUX_REPO} /tmp/flux-core
mv /tmp/flux-core/src/bindings/python/flux ./flux
/opt/conda/envs/build/bin/python3 setup.py sdist
Expand All @@ -92,10 +94,11 @@ jobs:
- name: Test Install
shell: bash
run: |
PIP_INSTALL="/opt/conda/envs/build/bin/python3 -m pip install"
${PIP_INSTALL} ./dist/*.whl || ${PIP_INSTALL} ./dist/*.whl --break-system-packages
# Use a clean environment so the build env cannot mask missing dependencies
/opt/conda/envs/build/bin/python3 -m venv /tmp/test-env
/tmp/test-env/bin/python3 -m pip install ./dist/*.whl
cd /tmp
/opt/conda/envs/build/bin/python3 -c "import flux, _flux._core, _flux._hostlist, _flux._idset; print(flux.__file__)"
/tmp/test-env/bin/python3 -c "import flux, flux.job, _flux._core, _flux._hostlist, _flux._idset; print(flux.__file__)"

- name: Upload Artifacts
if: success()
Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,13 @@ classifiers = [
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
]

# Corresponds to install_requires
dependencies = [
"cffi>=1.1",
"ply>=3.9",
"pyyaml"
]

Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
cffi>=1.1
ply>=3.9
pyyaml
Loading