Skip to content

Commit

Permalink
Test updated Forthon verison
Browse files Browse the repository at this point in the history
  • Loading branch information
holm10 committed Jul 12, 2024
1 parent 41b20a1 commit d3c99bc
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
16 changes: 6 additions & 10 deletions .github/workflows/build-test-wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Install pip dependencies
run: |
python -m pip install --upgrade pip
python -m pip install forthon numpy==1.26.4 h5py
python -m pip install "forthon>=0.10.7" numpy h5py
python -m pip install flake8
python -m pip install pytest-isolate pytest-xdist
- name: Build UEDGE
Expand All @@ -48,7 +48,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-13, macos-14]
pyver: [cp38, cp39, cp310, cp311, cp312]
pyver: [cp37, cp38, cp39, cp310, cp311, cp312]

steps:
- name: Checks out repo
Expand All @@ -74,9 +74,8 @@ jobs:
uses: pypa/[email protected]
env:
CIBW_BUILD: ${{matrix.pyver}}-*
CIBW_SKIP: cp37-*
CIBW_ARCHS_LINUX: auto
CIBW_BEFORE_BUILD: pip install numpy forthon 'build<0.10.0'
CIBW_BEFORE_BUILD: pip install numpy 'forthon>=0.10.7' 'build<0.10.0'

- name: Upload Artifacts
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -118,8 +117,7 @@ jobs:
uses: pypa/[email protected]
env:
CIBW_BUILD: pp*
CIBW_SKIP: cp37-*
CIBW_BEFORE_BUILD: pip install numpy forthon 'build<0.10.0'
CIBW_BEFORE_BUILD: pip install numpy 'forthon>=0.10.7' 'build<0.10.0'

- name: Upload Artifacts
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -151,9 +149,8 @@ jobs:
uses: pypa/[email protected]
env:
CIBW_BUILD: ${{matrix.pyver}}-*
CIBW_SKIP: cp37-*
CIBW_ARCHS: ${{matrix.arch}}
CIBW_BEFORE_BUILD: pip install numpy forthon 'build<0.10.0'
CIBW_BEFORE_BUILD: pip install numpy 'forthon>=0.10.7' 'build<0.10.0'

- name: Upload Artifacts
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -181,8 +178,7 @@ jobs:
uses: pypa/[email protected]
env:
CIBW_BUILD: pp*
CIBW_SKIP: cp37-*
CIBW_BEFORE_BUILD: pip install numpy forthon 'build<0.10.0'
CIBW_BEFORE_BUILD: pip install numpy 'forthon>=0.10.7' 'build<0.10.0'

- name: Upload Artifacts
uses: actions/upload-artifact@v4
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[build-system]
requires = [
"setuptools >= 61.0",
"forthon",
"numpy<2; python_version>='3.9'"
"forthon>=0.10.7",
"numpy"
]
build-backend = "setuptools.build_meta"

Expand All @@ -12,8 +12,8 @@ dynamic = ["version"]
#version = "8.1.0-beta.0"
name = "uedge"
dependencies = [
"forthon",
"numpy<2; python_version>='3.9'",
"forthon>=0.10.7",
"numpy"
]
requires-python = ">= 3.8" # TODO: verify
authors = [
Expand Down

0 comments on commit d3c99bc

Please sign in to comment.