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
17 changes: 9 additions & 8 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
- uses: actions/checkout@v4

- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Install cibuildwheel
run: python -m pip install cibuildwheel==2.21.3
Expand All @@ -31,9 +33,8 @@ jobs:
run: |
brew uninstall pkg-config || echo "pkg-config not installed, skipping uninstallation."
brew uninstall pkg-config@0.29.2 || echo "pkg-config@0.29.2 not available, skipping uninstallation."
brew install gsl
brew install hdf5

brew install gsl hdf5

- name: Windows dependencies
if: ${{ runner.os == 'Windows' }}
uses: mamba-org/setup-micromamba@v1
Expand Down Expand Up @@ -81,7 +82,6 @@ jobs:
run: |
python -m cibuildwheel --output-dir wheelhouse
ls wheelhouse

- name: MacOS package
if: runner.os == 'macOS'
env:
Expand All @@ -92,7 +92,7 @@ jobs:
brew uninstall pkg-config@0.29.2 || :
brew install gsl hdf5 meson ninja cmake &&
export PKG_CONFIG=`which pkg-config` &&
echo "<<<<<<<<<##########################################>>>>>>>>>>" &&
echo "<<<<<<<<<<##########################################>>>>>>>>>>" &&
echo "$$$$$ `pkg-config --libs gsl`" &&
echo "@@@@@ `pkg-config --cflags gsl`"
CIBW_ARCHS: 'arm64'
Expand All @@ -102,7 +102,6 @@ jobs:
export "MACOSX_DEPLOYMENT_TARGET=$(echo ${{ matrix.os }} | cut -c 7-8).0" # required because gsl2.8 has minimum target of 14.0
python -m cibuildwheel --output-dir wheelhouse
ls wheelhouse

- name: Windows package
if: runner.os == 'Windows'
env:
Expand All @@ -114,12 +113,14 @@ jobs:
micromamba activate moose
python -m cibuildwheel --output-dir wheelhouse
dir wheelhouse

- name: Upload to PyPI
if: always()
env:
TWINE_USERNAME: __token__ # Use __token__ as the username
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} # Use the secret with your PyPI token as the password
run: |
python -m pip install --upgrade twine # Ensure Twine is installed again
python -m twine --version # Debug: Check Twine version
which python # Debug: Ensure Python is available
which twine # Debug: Check if Twine is correctly installed
twine upload wheelhouse/*.whl # Upload the built wheels to PyPI
python -m twine upload wheelhouse/*.whl # Upload the built wheels to PyPI
14 changes: 10 additions & 4 deletions .github/workflows/pymoose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,18 @@ jobs:
python-version: ["3.12"]
include:
- os: ubuntu-22.04
apt: 10
apt: 10 # Linux will install the latest GSL version
- os: macos-14
brew: 20
brew: 20 # macOS will install the latest GSL version
- os: windows-latest
winget: 30
gsl_version: "2.6"
- os: windows-latest
winget: 30
gsl_version: "2.7"
- os: windows-latest
winget: 30
gsl_version: "2.8"
steps:
- name: mamba-setup
uses: mamba-org/setup-micromamba@v1
Expand Down Expand Up @@ -57,8 +64,7 @@ jobs:
- if: ${{ matrix.brew }}
run: |
brew list pkg-config && brew uninstall pkg-config || echo "pkg-config not installed, skipping uninstall."
brew list pkg-config@0.29.2 && brew uninstall pkg-config@0.29.2 || echo "pkg-config@0.29.2 not available, skipping uninstall."
brew install gsl
brew install gsl # Always install the latest GSL version on macOS
brew install hdf5
- name: checkout
uses: actions/checkout@v4
Expand Down
31 changes: 15 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,20 @@ details about MOOSE simulator, visit https://moose.ncbs.res.in .
----------
# Installation

See [INSTALL.md](INSTALL.md) for instructions on installation.
See [INSTALL.md](https://github.com/subhacom/moose-core/blob/master/INSTALL.md) for instructions on installation.

Have a look at examples, tutorials and demo here
https://github.com/BhallaLab/moose-examples.
Have a look at examples, tutorials, and demos here:
[https://github.com/BhallaLab/moose-examples](https://github.com/BhallaLab/moose-examples).

# Build

To build `pymoose`, follow instructions given in
[INSTALLATION.md](INSTALLATION.md) and for platform specific
information see:
- Linux: [UbuntuBuild.md](UbuntuBuild.md)
- MacOSX: [AppleM1Build.md](AppleM1Build.md)
- Windows: [WindowsBuild.md](WindowsBuild.md)
To build `pymoose`, follow the instructions given in
[INSTALL.md](https://github.com/subhacom/moose-core/blob/master/INSTALL.md)
and for platform-specific information, see:

- **Linux**: [UbuntuBuild.md](https://github.com/subhacom/moose-core/blob/master/UbuntuBuild.md)
- **MacOSX**: [AppleM1Build.md](https://github.com/subhacom/moose-core/blob/master/AppleM1Build.md)
- **Windows**: [WindowsBuild.md](https://github.com/subhacom/moose-core/blob/master/WindowsBuild.md)

# ABOUT VERSION 4.1.0, `Jhangri`

Expand All @@ -72,13 +73,11 @@ This release has the following major changes:
2. `HHGate2D`: separate `xminA`, `xminB`, etc. for `A` and `B` tables
replaced by single `xmin`, `xmax`, `xdivs`, `ymin`, `ymax`, and
`ydivs` fields for both tables.
2. Build system switched from cmake to meson
2. Native binaries for Windows
6. Updated to conform to c/c++-17 standard
7. Various bugfixes.
3. Build system switched from cmake to meson
4. Native binaries for Windows
5. Updated to conform to c/c++-17 standard
6. Various bugfixes.

# LICENSE

MOOSE is released under GPLv3.


MOOSE is released under GPLv3.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ requires = [
[project]
name = 'pymoose-development-Jayesh'
# dynamic = ['version']
version = '4.1.0'
version = '4.1.2'
description = 'Python scripting interface of MOOSE Simulator (https://moose.ncbs.res.in)'
readme = 'README.md'
classifiers = [
Expand Down
Loading