diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml index 447b99be..4467d33b 100644 --- a/.github/workflows/pip.yml +++ b/.github/workflows/pip.yml @@ -149,46 +149,46 @@ jobs: pytest if: matrix.platform == 'windows-latest' - - name: Upload wheels as build artifacts (non-windows) - if: matrix.platform != 'windows-latest' - run: | - for wheel_file in dist/*.whl; do - echo "Uploading $wheel_file" - echo "::set-output name=wheel_file::$wheel_file" - echo "::set-output name=artifact_name::$(basename $wheel_file)" - done - id: get_wheel_files_nonwindows - - - name: Upload wheels as build artifacts (windows) - if: matrix.platform == 'windows-latest' - shell: pwsh - run: | - foreach ($wheel_file in Get-ChildItem -Path dist -Filter *.whl) { - Write-Output "Uploading $wheel_file" - echo "::set-output name=wheel_file::$wheel_file" - echo "::set-output name=artifact_name::$(Split-Path $wheel_file -Leaf)" - } - id: get_wheel_files_windows - - - name: Upload wheel file (non-windows) - if: matrix.platform != 'windows-latest' - uses: actions/upload-artifact@v4 - with: - name: ${{ steps.get_wheel_files_nonwindows.outputs.artifact_name }} - path: ${{ steps.get_wheel_files_nonwindows.outputs.wheel_file }} +# - name: Upload wheels as build artifacts (non-windows) +# if: matrix.platform != 'windows-latest' +# run: | +# for wheel_file in dist/*.whl; do +# echo "Uploading $wheel_file" +# echo "::set-output name=wheel_file::$wheel_file" +# echo "::set-output name=artifact_name::$(basename $wheel_file)" +# done +# id: get_wheel_files_nonwindows +# +# - name: Upload wheels as build artifacts (windows) +# if: matrix.platform == 'windows-latest' +# shell: pwsh +# run: | +# foreach ($wheel_file in Get-ChildItem -Path dist -Filter *.whl) { +# Write-Output "Uploading $wheel_file" +# echo "::set-output name=wheel_file::$wheel_file" +# echo "::set-output name=artifact_name::$(Split-Path $wheel_file -Leaf)" +# } +# id: get_wheel_files_windows +# +# - name: Upload wheel file (non-windows) +# if: matrix.platform != 'windows-latest' +# uses: actions/upload-artifact@v4 +# with: +# name: ${{ steps.get_wheel_files_nonwindows.outputs.artifact_name }} +# path: ${{ steps.get_wheel_files_nonwindows.outputs.wheel_file }} +# +# - name: Upload wheel file (windows) +# if: matrix.platform == 'windows-latest' +# uses: actions/upload-artifact@v4 +# with: +# name: ${{ steps.get_wheel_files_windows.outputs.artifact_name }} +# path: ${{ steps.get_wheel_files_windows.outputs.wheel_file }} - - name: Upload wheel file (windows) - if: matrix.platform == 'windows-latest' + - name: Upload wheels as build artifacts uses: actions/upload-artifact@v4 with: - name: ${{ steps.get_wheel_files_windows.outputs.artifact_name }} - path: ${{ steps.get_wheel_files_windows.outputs.wheel_file }} - -# - name: Upload wheels as build artifacts -# uses: actions/upload-artifact@v4 -# with: -# name: wheels-${{ matrix.platform }}-${{ matrix.python-version }} -# path: dist/*.whl + name: wheels + path: dist/*.whl - name: Setup tmate session uses: mxschmitt/action-tmate@v3 diff --git a/.gitignore b/.gitignore index 544b28d2..b9c043b7 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,7 @@ .DS_Store /dist/ + +tests/__pycache__/ + +*.whl diff --git a/README.md b/README.md index 337cf1b1..4c9d8a11 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,11 @@ ![CI](https://github.com/virtualcell/vcell-solvers/actions/workflows/cd.yml/badge.svg) # vcell-fvsolver -Virtual Cell solvers [virtualcell/vcell-solvers](https://github.com/virtualcell/vcell-solvers) is a collection of numerical simulation codes used in the Virtual Cell framework [virtualcell/vcell](https://github.com/virtualcell/vcell)). +Virtual Cell Finite Volume solver [virtualcell/vcell-solvers](https://github.com/virtualcell/vcell-fvsolver) +is a reaction-diffusion-advection PDE solver for computational cell biology. +This solver is used within the Virtual Cell modeling and simulation application [virtualcell/vcell](https://github.com/virtualcell/vcell) +and as a component in the Virtual Cell Python API [virtualcell/pyvcell](https://github.com/virtualcell/pyvcell) (coming soon). - ## The Virtual Cell Project The Virtual Cell is a modeling and simulation framework for computational biology. For details see http://vcell.org and http://github.com/virtualcell. @@ -27,4 +29,4 @@ and generates the output files (.log, .zip, .mesh, .meshmetrics, .hdf5). The .functions file is not used by the solver, but is helpful for interpreting the results in the context of the original model. -This package is intented to be used by the Virtual Cell Python API, pyvcell (coming soon). +This package is intended to be used by the Virtual Cell Python API [virtualcell/pyvcell](https://github.com/virtualcell/pyvcell) (coming soon). diff --git a/tests/test_basic.py b/tests/test_basic.py index 1077a16e..cd660e22 100644 --- a/tests/test_basic.py +++ b/tests/test_basic.py @@ -1,7 +1,9 @@ import pyvcell_fvsolver as fv + def test_version(): assert fv.__version__ == "0.0.1" -def test_version(): + +def test_version_function(): assert fv.version() is not None