Skip to content

Commit 16ed7be

Browse files
committed
packaging: add missing ply
Problem: an import of ply is now required for flux.job Solution: add it to the pyproject. Signed-off-by: vsoch <vsoch@users.noreply.github.com>
1 parent 8050665 commit 16ed7be

4 files changed

Lines changed: 15 additions & 8 deletions

File tree

‎.github/scripts/requirements-dev.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
cffi>=1.1
2+
ply>=3.9
23
pyyaml
34
jsonschema
45
docutils

‎.github/workflows/build-release.yaml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ on:
1313
description: 'Release candidate to build (for wheel)'
1414
default: "0"
1515
branch:
16-
description: 'Branch to build from'
17-
default: "master"
16+
description: 'Branch or tag to build from (defaults to v<release_version>)'
17+
default: ""
1818
repo:
1919
description: 'Repository to build from'
2020
default: "https://github.com/flux-framework/flux-core"
@@ -65,16 +65,18 @@ jobs:
6565
env:
6666
FLUX_BRANCH: ${{ inputs.branch }}
6767
FLUX_REPO: ${{ inputs.repo }}
68+
FLUX_RELEASE_VERSION: ${{ inputs.release_version || '0.88.0' }}
6869
shell: bash
6970
run: |
70-
echo "Flux Repo: ${FLUX_REPO}"
71-
echo "Flux Branch: ${FLUX_BRANCH}"
7271
if [[ "${FLUX_REPO}" == "" ]]; then
7372
FLUX_REPO="https://github.com/flux-framework/flux-core"
7473
fi
74+
# Match the bindings to the release that libflux was built from
7575
if [[ "${FLUX_BRANCH}" == "" ]]; then
76-
FLUX_BRANCH="master"
76+
FLUX_BRANCH="v${FLUX_RELEASE_VERSION}"
7777
fi
78+
echo "Flux Repo: ${FLUX_REPO}"
79+
echo "Flux Branch: ${FLUX_BRANCH}"
7880
git clone -b ${FLUX_BRANCH} ${FLUX_REPO} /tmp/flux-core
7981
mv /tmp/flux-core/src/bindings/python/flux ./flux
8082
/opt/conda/envs/build/bin/python3 setup.py sdist
@@ -92,10 +94,11 @@ jobs:
9294
- name: Test Install
9395
shell: bash
9496
run: |
95-
PIP_INSTALL="/opt/conda/envs/build/bin/python3 -m pip install"
96-
${PIP_INSTALL} ./dist/*.whl || ${PIP_INSTALL} ./dist/*.whl --break-system-packages
97+
# Use a clean environment so the build env cannot mask missing dependencies
98+
/opt/conda/envs/build/bin/python3 -m venv /tmp/test-env
99+
/tmp/test-env/bin/python3 -m pip install ./dist/*.whl
97100
cd /tmp
98-
/opt/conda/envs/build/bin/python3 -c "import flux, _flux._core, _flux._hostlist, _flux._idset; print(flux.__file__)"
101+
/tmp/test-env/bin/python3 -c "import flux, flux.job, _flux._core, _flux._hostlist, _flux._idset; print(flux.__file__)"
99102
100103
- name: Upload Artifacts
101104
if: success()

‎pyproject.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ classifiers = [
3333
"Programming Language :: Python :: 3.11",
3434
"Programming Language :: Python :: 3.12",
3535
"Programming Language :: Python :: 3.13",
36+
"Programming Language :: Python :: 3.14",
3637
]
3738

3839
# Corresponds to install_requires
3940
dependencies = [
4041
"cffi>=1.1",
42+
"ply>=3.9",
4143
"pyyaml"
4244
]
4345

‎requirements.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
cffi>=1.1
2+
ply>=3.9
23
pyyaml

0 commit comments

Comments
 (0)