Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build conda packages for Python 3.8 - 3.11 #44

Merged
merged 56 commits into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
075c175
Add build scripts for vtk py311
kwabenantim Sep 14, 2023
1c06355
Add build config for vtk py311
kwabenantim Sep 14, 2023
a06cd7e
Merge branch 'develop' into vtk_py311
kwabenantim Sep 14, 2023
fb33f5f
update vtk yaml config
kwabenantim Oct 2, 2023
0acca0f
Add vtk 7 patches for hdf5 1.12
kwabenantim Oct 2, 2023
5273349
De-escalate vtk build docker commands
kwabenantim Oct 2, 2023
3d23a07
Update pychaste conda build for py311
kwabenantim Oct 2, 2023
30cd482
Update vtk build scripts
kwabenantim Oct 20, 2023
d5c909b
Update conda build script
kwabenantim Oct 20, 2023
7da72aa
Merge branch 'develop' into vtk_py311
kwabenantim Apr 11, 2024
d4eecc4
Merge branch 'develop' into vtk_py311
kwabenantim Apr 15, 2024
dbd273c
#42 add yaml for python 3.8 to 3.11
kwabenantim Apr 16, 2024
d1ac844
#42 update setup.py
kwabenantim Apr 16, 2024
3d1c41f
#42 add yaml for python 3.12
kwabenantim Apr 16, 2024
3c221c4
#42 remove unused custom conda builds
kwabenantim Apr 16, 2024
5ae4a78
#42 separate chaste py build scripts
kwabenantim Apr 16, 2024
dc066ba
#42 separate vtk py build scripts
kwabenantim Apr 16, 2024
bb2c663
#42 update conda build chaste refs
kwabenantim Apr 16, 2024
7e8b55b
#29 update xsd build scripts
kwabenantim Apr 16, 2024
5be62bb
#29 update xsd conda script
kwabenantim Apr 16, 2024
3499f12
#29 update xsd conda script
kwabenantim Apr 16, 2024
18e0792
#29 build xsd from source
kwabenantim Apr 16, 2024
028a39c
#29 add xsd macos variants
kwabenantim Apr 16, 2024
2d5306d
#29 update xsd xerces dependency
kwabenantim Apr 16, 2024
105e3ff
#29 get xsd patch
kwabenantim Apr 16, 2024
e41d0bd
#29 relax xsd xerces dependency
kwabenantim Apr 16, 2024
526bb15
#29 relax xsd dependencies
kwabenantim Apr 16, 2024
e819d5f
#29 update xsd variants
kwabenantim Apr 17, 2024
0f08777
#29 update build artifacts in gitignore
kwabenantim Apr 17, 2024
9221ce3
#29 remove bioconda channel
kwabenantim Apr 17, 2024
1ec2903
#42 update vtk build structure
kwabenantim Apr 17, 2024
2d35c2f
#42 add vtk build variants
kwabenantim Apr 17, 2024
78d1999
#42 update vtk conda recipe
kwabenantim Apr 17, 2024
e0cce1c
#42 restructure chaste conda scripts
kwabenantim Apr 17, 2024
618a4fe
#42 reduce vtk dependencies
kwabenantim Apr 17, 2024
e6d8a26
#42 update chaste conda variants
kwabenantim Apr 17, 2024
42358f0
#42 chaste conda remove old patches
kwabenantim Apr 17, 2024
2831892
#42 relax conda vtk cmake cxx std
kwabenantim Apr 18, 2024
d7abd44
#42 update conda vtk recipe for py310
kwabenantim Apr 18, 2024
233436e
#42 update conda build action
kwabenantim Apr 18, 2024
dfac114
#42 tweak conda build action
kwabenantim Apr 18, 2024
ced740e
#42 update conda recipe versions
kwabenantim Apr 18, 2024
ea6c74d
#42 test core imports
kwabenantim Apr 18, 2024
78f606b
#42 test mesh imports
kwabenantim Apr 18, 2024
01828b0
#42 test ode imports
kwabenantim Apr 19, 2024
54d7d0b
#42 test pde imports
kwabenantim Apr 19, 2024
cc22bc2
#42 add visualization imports
kwabenantim Apr 19, 2024
c6396ee
#42 test cell_based imports
kwabenantim Apr 19, 2024
3656458
#42 remove duplicate Edge wrappers
kwabenantim Apr 19, 2024
cf0f90f
#42 remove duplicate EdgeOperation wrappers
kwabenantim Apr 19, 2024
54ce6b5
#42 Update READMEs
kwabenantim Apr 19, 2024
5d26d35
#42 update vtk variants
kwabenantim Apr 19, 2024
38d1cab
#42 update chaste conda variants
kwabenantim Apr 19, 2024
78897b3
#42 update py versions in setup.py
kwabenantim Apr 19, 2024
6af5abd
#42 update conda build action
kwabenantim Apr 19, 2024
940f4b5
#42 test conda install for py3.8-3.11
kwabenantim Apr 19, 2024
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
34 changes: 21 additions & 13 deletions .github/workflows/conda-build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,31 @@ name: conda-build-linux

on:
workflow_dispatch:
inputs:
variant:
description: "Variant of the conda package to build"
required: true
type: string
default: "linux_64_python3.10_cpython"

jobs:

build:

runs-on: ubuntu-latest

steps:
- name: checkout
uses: actions/checkout@v4
- name: checkout
uses: actions/checkout@v4

- name: build conda package
run: ./build-py310.sh
working-directory: infra/conda/chaste

- name: upload conda package artifacts
uses: actions/upload-artifact@v4
with:
name: pychaste-conda
path: infra/conda/chaste/build_artifacts/linux-64
- name: build conda package
run: |
docker run -e HOST_USER_ID="$(id -u)" -v $(pwd):/home/conda \
quay.io/condaforge/linux-anvil-cos7-x86_64 ./build-package.sh \
--variant=${{ github.event.inputs.variant }} \
--parallel=$(nproc)
working-directory: infra/conda/chaste/2024.1

- name: upload conda package artifacts
uses: actions/upload-artifact@v4
with:
name: pychaste-conda
path: infra/conda/chaste/build_artifacts/linux-64
9 changes: 7 additions & 2 deletions .github/workflows/test-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ jobs:
test-conda:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]

steps:
- name: install dependencies
run: |
Expand All @@ -22,9 +27,9 @@ jobs:
use-mamba: true
miniforge-variant: Mambaforge
miniforge-version: latest
python-version: "3.10"
python-version: ${{ matrix.python-version }}
activate-environment: pychaste_test
channels: pychaste,conda-forge,bioconda
channels: pychaste,conda-forge

- name: install pychaste
run: mamba install -n pychaste_test -y chaste
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# No shared libraries and compiled Python
*.so
*.pyc
__pycache__/
# No eclipse settings
*.project
*.cproject
Expand Down
15 changes: 11 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
# PyChaste

PyChaste is a Python wrapper for [Chaste](https://chaste.github.io/), a general purpose simulation package for computational biology.
PyChaste is a Python wrapper for [Chaste](https://chaste.github.io/), a general
purpose simulation package for computational biology.

Currently a limited number of features are supported, mostly related to
cell-based Chaste.

## Installation
`mamba install -c pychaste -c conda-forge -c bioconda chaste`
`mamba install -c pychaste -c conda-forge chaste`

See the [website](https://chaste.github.io/pychaste/installation/) for a detailed guide on installing PyChaste.
See the [website](https://chaste.github.io/pychaste/installation/) for a
detailed guide on installing PyChaste.

## Tutorials
See the [website](https://chaste.github.io/pychaste/tutorials/) for tutorials demonstrating how to use PyChaste.
See the [website](https://chaste.github.io/pychaste/tutorials/) for tutorials
demonstrating how to use PyChaste.

## Extending
See the [wiki](../../wiki/) for guidance on extending PyChaste.

103 changes: 0 additions & 103 deletions dynamic/wrappers/cell_based/Edge2.cppwg.cpp

This file was deleted.

6 changes: 0 additions & 6 deletions dynamic/wrappers/cell_based/Edge2.cppwg.hpp

This file was deleted.

103 changes: 0 additions & 103 deletions dynamic/wrappers/cell_based/Edge3.cppwg.cpp

This file was deleted.

6 changes: 0 additions & 6 deletions dynamic/wrappers/cell_based/Edge3.cppwg.hpp

This file was deleted.

55 changes: 0 additions & 55 deletions dynamic/wrappers/cell_based/EdgeOperation.cppwg.cpp

This file was deleted.

6 changes: 0 additions & 6 deletions dynamic/wrappers/cell_based/EdgeOperation.cppwg.hpp

This file was deleted.

10 changes: 10 additions & 0 deletions infra/conda/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
*.pyc
build_artifacts/
.bash_history
.bash_logout
.bash_profile
.bashrc
.conda/
.condarc
.cache
.python_history
Loading