From 2007917717d509e75fe50101e2ea2286544f16bd Mon Sep 17 00:00:00 2001 From: Chinta User Date: Mon, 10 Feb 2025 15:43:14 +0530 Subject: [PATCH 01/12] updated the README.MD file --- README.md | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index e215dfc..3595dee 100644 --- a/README.md +++ b/README.md @@ -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` @@ -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. \ No newline at end of file From 25368e8d65d489b8063857c7574db1160e19ab53 Mon Sep 17 00:00:00 2001 From: Jayesh251 Date: Mon, 10 Feb 2025 16:17:05 +0530 Subject: [PATCH 02/12] Bump version to 4.1.1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7b6f8e7..00371cc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ requires = [ [project] name = 'pymoose-development-Jayesh' # dynamic = ['version'] -version = '4.1.0' +version = '4.1.1' description = 'Python scripting interface of MOOSE Simulator (https://moose.ncbs.res.in)' readme = 'README.md' classifiers = [ From d964ed69690e2de1d2e946040b4892dd4418976b Mon Sep 17 00:00:00 2001 From: Jayesh251 Date: Mon, 10 Feb 2025 16:37:23 +0530 Subject: [PATCH 03/12] Update package.yml --- .github/workflows/package.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index fdcd824..a970602 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -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 @@ -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 @@ -92,7 +93,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' @@ -116,10 +117,13 @@ jobs: 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 From 0462d1a57481f47587c2425d789c9b3a2fbebbbc Mon Sep 17 00:00:00 2001 From: Jayesh251 Date: Thu, 6 Mar 2025 14:44:09 +0530 Subject: [PATCH 04/12] Update pymoose.yml for multi GSL version --- .github/workflows/pymoose.yml | 56 +++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/.github/workflows/pymoose.yml b/.github/workflows/pymoose.yml index 80541ea..6b4a54f 100644 --- a/.github/workflows/pymoose.yml +++ b/.github/workflows/pymoose.yml @@ -1,4 +1,4 @@ -name: Build install test +name: Build and Test on: [push] @@ -12,15 +12,20 @@ jobs: build_type: [Release] c_compiler: [clang] python-version: ["3.12"] + gsl_version: ["2.6", "2.7", "2.8"] # Multiple GSL versions include: - os: ubuntu-22.04 - apt: 10 + apt: true - os: macos-14 - brew: 20 + brew: true - os: windows-latest - winget: 30 + winget: true + steps: - - name: mamba-setup + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Setup Micromamba uses: mamba-org/setup-micromamba@v1 with: environment-name: moose @@ -44,26 +49,32 @@ jobs: meson ninja meson-python - gsl post-cleanup: all - generate-run-shell: false - - name: Display Python version - run: | - python -c "import sys; print(sys.version)" - - if: ${{ matrix.apt }} + generate-run-shell: false + + - name: Install GSL (Linux) + if: matrix.apt run: | sudo apt-get update - sudo apt-get -y install libgsl0-dev libgsl-dev libhdf5-dev - - if: ${{ matrix.brew }} + sudo apt-get -y install libgsl-dev libhdf5-dev + + - name: Install GSL (MacOS) + 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@${{ matrix.gsl_version }} brew install hdf5 - - name: checkout - uses: actions/checkout@v4 - - name: Build and install (non-windows) - if: runner.os != 'Windows' + + - name: Install GSL (Windows) + if: matrix.winget + run: | + micromamba install gsl=${{ matrix.gsl_version }} + + - name: Display Python Version + run: | + python -c "import sys; print(sys.version)" + + - name: Build and Install (Non-Windows) + if: runner.os != 'Windows' run: | eval "$(micromamba shell hook --shell bash)" micromamba activate moose @@ -71,8 +82,9 @@ jobs: pip install python-libsbml pip install . python -c "import moose; moose.le()" - - name: Build and install (windows) - if: runner.os == 'Windows' + + - name: Build and Install (Windows) + if: runner.os == 'Windows' run: | micromamba shell hook -s powershell | Out-String | Invoke-Expression micromamba activate moose From d2f7eb0a190e849f0198b7cafa61c415866f662e Mon Sep 17 00:00:00 2001 From: Jayesh251 Date: Thu, 6 Mar 2025 14:45:00 +0530 Subject: [PATCH 05/12] Update package.yml for package.yaml --- .github/workflows/package.yml | 74 +++++++++++++---------------------- 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index a970602..4d5b798 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -1,4 +1,4 @@ -name: Python package +name: Python Package on: [push] @@ -15,6 +15,8 @@ jobs: build_type: [Release] c_compiler: [clang] python-version: ['3.11'] + gsl_version: ["2.6", "2.7", "2.8"] # Multiple GSL versions + steps: - uses: actions/checkout@v4 @@ -22,21 +24,23 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.21.3 + - name: Install cibuildwheel and Twine + run: python -m pip install cibuildwheel==2.21.3 twine - - name: Install Twine - run: python -m pip install twine # Install Twine for uploading the package + - name: Install GSL (MacOS) + if: runner.os == 'macOS' + run: | + brew install gsl@${{ matrix.gsl_version }} + brew install hdf5 - - name: MacOS dependencies - if: ${{ runner.os == 'macOS' }} + - name: Install GSL (Linux) + if: runner.os == 'Linux' 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 hdf5 - - - name: Windows dependencies - if: ${{ runner.os == 'Windows' }} + sudo apt-get update + sudo apt-get -y install libgsl-dev libhdf5-dev + + - name: Setup Micromamba (Windows) + if: runner.os == 'Windows' uses: mamba-org/setup-micromamba@v1 with: environment-name: moose @@ -44,6 +48,7 @@ jobs: cache-downloads: true create-args: >- python=${{ matrix.python-version }} + gsl=${{ matrix.gsl_version }} pkg-config clang hdf5 @@ -60,54 +65,34 @@ jobs: meson ninja meson-python - gsl cibuildwheel post-cleanup: all generate-run-shell: false - - name: Linux package + - name: Build Linux Wheel if: runner.os == 'Linux' env: - CIBW_BUILD_VERBOSITY: 1 - CIBW_BEFORE_ALL: 'uname -a' CIBW_BEFORE_ALL_LINUX: > - yum install -y epel-release && - yum install -y pkgconfig && - yum install -y gsl-devel && - yum install -y hdf5-devel + yum install -y gsl-devel hdf5-devel CIBW_BUILD: '*-manylinux_x86_64' CIBW_SKIP: 'pp*' - CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28 - CIBW_MANYLINUX_PYPY_X86_64_IMAGE: manylinux_2_28 run: | python -m cibuildwheel --output-dir wheelhouse ls wheelhouse - - name: MacOS package + - name: Build MacOS Wheel if: runner.os == 'macOS' env: - CIBW_BUILD_VERBOSITY: 1 - CIBW_BEFORE_ALL: 'uname -a' - CIBW_BEFORE_ALL_MACOS: > - brew uninstall pkg-config || : - brew uninstall pkg-config@0.29.2 || : - brew install gsl hdf5 meson ninja cmake && - export PKG_CONFIG=`which pkg-config` && - echo "<<<<<<<<<<##########################################>>>>>>>>>>" && - echo "$$$$$ `pkg-config --libs gsl`" && - echo "@@@@@ `pkg-config --cflags gsl`" - CIBW_ARCHS: 'arm64' CIBW_BUILD: '*-macosx_arm64' CIBW_SKIP: 'pp* cp38*' run: | - export "MACOSX_DEPLOYMENT_TARGET=$(echo ${{ matrix.os }} | cut -c 7-8).0" # required because gsl2.8 has minimum target of 14.0 + export "MACOSX_DEPLOYMENT_TARGET=14.0" python -m cibuildwheel --output-dir wheelhouse ls wheelhouse - - name: Windows package - if: runner.os == 'Windows' + - name: Build Windows Wheel + if: runner.os == 'Windows' env: - CIBW_BEFORE_ALL: 'uname -a' CIBW_BUILD: '*-win_*' CIBW_SKIP: '*-win32 pp*' run: | @@ -117,13 +102,8 @@ jobs: 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 + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} 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 - python -m twine upload wheelhouse/*.whl # Upload the built wheels to PyPI + python -m twine upload wheelhouse/*.whl From f0d813adc5f4715e42d11b43fecf00c71d26944b Mon Sep 17 00:00:00 2001 From: Jayesh251 Date: Thu, 6 Mar 2025 15:04:01 +0530 Subject: [PATCH 06/12] Update pymoose.yml --- .github/workflows/pymoose.yml | 53 ++++++++++++++--------------------- 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/.github/workflows/pymoose.yml b/.github/workflows/pymoose.yml index 6b4a54f..e295f37 100644 --- a/.github/workflows/pymoose.yml +++ b/.github/workflows/pymoose.yml @@ -1,4 +1,4 @@ -name: Build and Test +name: Build install test on: [push] @@ -15,17 +15,13 @@ jobs: gsl_version: ["2.6", "2.7", "2.8"] # Multiple GSL versions include: - os: ubuntu-22.04 - apt: true + apt: 10 - os: macos-14 - brew: true + brew: 20 - os: windows-latest - winget: true - + winget: 30 steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - - name: Setup Micromamba + - name: mamba-setup uses: mamba-org/setup-micromamba@v1 with: environment-name: moose @@ -49,32 +45,26 @@ jobs: meson ninja meson-python + gsl=${{ matrix.gsl_version }} post-cleanup: all - generate-run-shell: false - - - name: Install GSL (Linux) - if: matrix.apt + generate-run-shell: false + - name: Display Python version + run: | + python -c "import sys; print(sys.version)" + - if: ${{ matrix.apt }} run: | sudo apt-get update - sudo apt-get -y install libgsl-dev libhdf5-dev - - - name: Install GSL (MacOS) - if: matrix.brew + sudo apt-get -y install libgsl0-dev libgsl-dev libhdf5-dev + - 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@${{ matrix.gsl_version }} brew install hdf5 - - - name: Install GSL (Windows) - if: matrix.winget - run: | - micromamba install gsl=${{ matrix.gsl_version }} - - - name: Display Python Version - run: | - python -c "import sys; print(sys.version)" - - - name: Build and Install (Non-Windows) - if: runner.os != 'Windows' + - name: checkout + uses: actions/checkout@v4 + - name: Build and install (non-windows) + if: runner.os != 'Windows' run: | eval "$(micromamba shell hook --shell bash)" micromamba activate moose @@ -82,9 +72,8 @@ jobs: pip install python-libsbml pip install . python -c "import moose; moose.le()" - - - name: Build and Install (Windows) - if: runner.os == 'Windows' + - name: Build and install (windows) + if: runner.os == 'Windows' run: | micromamba shell hook -s powershell | Out-String | Invoke-Expression micromamba activate moose From 28ee22736ab51f57a09df43124d1a5ee1da8b04a Mon Sep 17 00:00:00 2001 From: Jayesh251 Date: Thu, 6 Mar 2025 15:15:53 +0530 Subject: [PATCH 07/12] Update pymoose.yml building with multi GSL --- .github/workflows/pymoose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pymoose.yml b/.github/workflows/pymoose.yml index e295f37..34f7a43 100644 --- a/.github/workflows/pymoose.yml +++ b/.github/workflows/pymoose.yml @@ -12,7 +12,7 @@ jobs: build_type: [Release] c_compiler: [clang] python-version: ["3.12"] - gsl_version: ["2.6", "2.7", "2.8"] # Multiple GSL versions + gsl_version: ["2.6", "2.7", "2.8"] # Multiple GSL versions for Linux and Windows include: - os: ubuntu-22.04 apt: 10 @@ -58,8 +58,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@${{ matrix.gsl_version }} + brew install gsl # Always install the latest GSL version on macOS brew install hdf5 - name: checkout uses: actions/checkout@v4 From db1d196defe93e2c042e11376fb1144e3608f457 Mon Sep 17 00:00:00 2001 From: Jayesh251 Date: Thu, 6 Mar 2025 15:28:45 +0530 Subject: [PATCH 08/12] Update pymoose.yml multi GSL support for windows --- .github/workflows/pymoose.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pymoose.yml b/.github/workflows/pymoose.yml index 34f7a43..30e1764 100644 --- a/.github/workflows/pymoose.yml +++ b/.github/workflows/pymoose.yml @@ -12,14 +12,20 @@ jobs: build_type: [Release] c_compiler: [clang] python-version: ["3.12"] - gsl_version: ["2.6", "2.7", "2.8"] # Multiple GSL versions for Linux and Windows 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 @@ -45,7 +51,6 @@ jobs: meson ninja meson-python - gsl=${{ matrix.gsl_version }} post-cleanup: all generate-run-shell: false - name: Display Python version From 303adba3c41a19263ef9e6f04521ff57dc74bd79 Mon Sep 17 00:00:00 2001 From: Jayesh251 Date: Thu, 6 Mar 2025 15:39:17 +0530 Subject: [PATCH 09/12] Update pymoose.yml --- .github/workflows/pymoose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pymoose.yml b/.github/workflows/pymoose.yml index 30e1764..c0dad74 100644 --- a/.github/workflows/pymoose.yml +++ b/.github/workflows/pymoose.yml @@ -51,6 +51,7 @@ jobs: meson ninja meson-python + gsl post-cleanup: all generate-run-shell: false - name: Display Python version From 4a5004d55d0bcd8d4c0b0e0f7cefc84c4acdc6f6 Mon Sep 17 00:00:00 2001 From: Jayesh251 Date: Thu, 6 Mar 2025 16:06:28 +0530 Subject: [PATCH 10/12] Update package.yml --- .github/workflows/package.yml | 77 +++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 30 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 4d5b798..2439777 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -1,4 +1,4 @@ -name: Python Package +name: Python package on: [push] @@ -15,8 +15,6 @@ jobs: build_type: [Release] c_compiler: [clang] python-version: ['3.11'] - gsl_version: ["2.6", "2.7", "2.8"] # Multiple GSL versions - steps: - uses: actions/checkout@v4 @@ -24,23 +22,21 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Install cibuildwheel and Twine - run: python -m pip install cibuildwheel==2.21.3 twine + - name: Install cibuildwheel + run: python -m pip install cibuildwheel==2.21.3 - - name: Install GSL (MacOS) - if: runner.os == 'macOS' - run: | - brew install gsl@${{ matrix.gsl_version }} - brew install hdf5 + - name: Install Twine + run: python -m pip install twine # Install Twine for uploading the package - - name: Install GSL (Linux) - if: runner.os == 'Linux' + - name: MacOS dependencies + if: ${{ runner.os == 'macOS' }} run: | - sudo apt-get update - sudo apt-get -y install libgsl-dev libhdf5-dev - - - name: Setup Micromamba (Windows) - if: runner.os == 'Windows' + 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 hdf5 + + - name: Windows dependencies + if: ${{ runner.os == 'Windows' }} uses: mamba-org/setup-micromamba@v1 with: environment-name: moose @@ -48,7 +44,6 @@ jobs: cache-downloads: true create-args: >- python=${{ matrix.python-version }} - gsl=${{ matrix.gsl_version }} pkg-config clang hdf5 @@ -65,34 +60,52 @@ jobs: meson ninja meson-python + gsl cibuildwheel post-cleanup: all generate-run-shell: false - - name: Build Linux Wheel + - name: Linux package if: runner.os == 'Linux' env: + CIBW_BUILD_VERBOSITY: 1 + CIBW_BEFORE_ALL: 'uname -a' CIBW_BEFORE_ALL_LINUX: > - yum install -y gsl-devel hdf5-devel + yum install -y epel-release && + yum install -y pkgconfig && + yum install -y gsl-devel && + yum install -y hdf5-devel CIBW_BUILD: '*-manylinux_x86_64' CIBW_SKIP: 'pp*' + CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28 + CIBW_MANYLINUX_PYPY_X86_64_IMAGE: manylinux_2_28 run: | python -m cibuildwheel --output-dir wheelhouse ls wheelhouse - - - name: Build MacOS Wheel + - name: MacOS package if: runner.os == 'macOS' env: + CIBW_BUILD_VERBOSITY: 1 + CIBW_BEFORE_ALL: 'uname -a' + CIBW_BEFORE_ALL_MACOS: > + brew uninstall pkg-config || : + brew uninstall pkg-config@0.29.2 || : + brew install gsl hdf5 meson ninja cmake && + export PKG_CONFIG=`which pkg-config` && + echo "<<<<<<<<<<##########################################>>>>>>>>>>" && + echo "$$$$$ `pkg-config --libs gsl`" && + echo "@@@@@ `pkg-config --cflags gsl`" + CIBW_ARCHS: 'arm64' CIBW_BUILD: '*-macosx_arm64' CIBW_SKIP: 'pp* cp38*' run: | - export "MACOSX_DEPLOYMENT_TARGET=14.0" + 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: Build Windows Wheel - if: runner.os == 'Windows' + - name: Windows package + if: runner.os == 'Windows' env: + CIBW_BEFORE_ALL: 'uname -a' CIBW_BUILD: '*-win_*' CIBW_SKIP: '*-win32 pp*' run: | @@ -100,10 +113,14 @@ jobs: micromamba activate moose python -m cibuildwheel --output-dir wheelhouse dir wheelhouse - - name: Upload to PyPI + if: always() env: - TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} + 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 twine upload wheelhouse/*.whl + 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 + python -m twine upload wheelhouse/*.whl # Upload the built wheels to PyPI From 2dff4610e89ef7a0e32df77e32e6d99b63884fc0 Mon Sep 17 00:00:00 2001 From: Jayesh251 Date: Thu, 6 Mar 2025 16:21:11 +0530 Subject: [PATCH 11/12] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 00371cc..36e724b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ requires = [ [project] name = 'pymoose-development-Jayesh' # dynamic = ['version'] -version = '4.1.1' +version = '4.1' description = 'Python scripting interface of MOOSE Simulator (https://moose.ncbs.res.in)' readme = 'README.md' classifiers = [ From 28083e3697480e74d8a2e8e524fc63696b701573 Mon Sep 17 00:00:00 2001 From: Jayesh251 Date: Thu, 6 Mar 2025 17:00:04 +0530 Subject: [PATCH 12/12] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 36e724b..ea1ffda 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ requires = [ [project] name = 'pymoose-development-Jayesh' # dynamic = ['version'] -version = '4.1' +version = '4.1.2' description = 'Python scripting interface of MOOSE Simulator (https://moose.ncbs.res.in)' readme = 'README.md' classifiers = [