Skip to content

Commit

Permalink
Update build_wheels_and_publish.yml (#677)
Browse files Browse the repository at this point in the history
* Update build_wheels_and_publish.yml

* Update build_wheels_and_publish.yml

split mac and linux builds

* Update build_wheels_and_publish.yml

trying to get cibuildwheels working again for linux

* Update pyproject.toml

removed pytest from cibuildwheel args

* Update build_wheels_and_publish.yml

don't actually publish

* Update build_wheels_and_publish.yml

* Update build_wheels_and_publish.yml

* Update build_wheels_and_publish.yml

* Update build_wheels_and_publish.yml

* Update build_wheels_and_publish.yml

* Update _version.py

* Update pyproject.toml

* Update meson.build
  • Loading branch information
katiebreivik authored Sep 28, 2024
1 parent 6305dc6 commit 60ed167
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 15 deletions.
22 changes: 16 additions & 6 deletions .github/workflows/build_wheels_and_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ on:
types: [published]
workflow_dispatch:

env:
CIBW_BUILD: "cp39-* cp310-*"
CIBW_ARCHS_LINUX: "x86_64"
CIBW_SKIP: "*-win32 *musllinux*"
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
CIBW_BEFORE_BUILD: pip install numpy --config-settings=setup-args="-Dallow-noblas=true"
CIBW_BUILD_VERBOSITY: "1"

jobs:
build-wheels-and-dist:
Expand Down Expand Up @@ -37,18 +44,21 @@ jobs:
- name: Install dependencies
run: |
python -m pip install setuptools wheel build meson-python ninja meson pytest auditwheel
python -m pip install setuptools wheel build meson-python ninja meson pytest cibuildwheel
- name: Build source and wheels distribution
- name: Build source and wheels distribution on MacOS
if: runner.os == 'macOS'
run: |
python -m build --outdir dist
auditwheel repair ./dist/*.whl
- name: test distribution
run: |
find ./dist/*.whl | xargs pip install
pytest src/cosmic
- name: Build source and wheels distribution on Linux
if: runner.os == 'Linux'
run: |
python -m build --sdist --outdir dist
python -m cibuildwheel --output-dir dist
- uses: actions/upload-artifact@v3
with:
path: ./dist/*.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project('cosmic',
'c',
'fortran',
version : '3.4.16',
version : '3.4.17',
default_options: ['warning_level=0', 'optimization=3'],
)

Expand Down
8 changes: 1 addition & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ authors = [
{ name="Tom Wagg" },
]
readme = "README.md"
version = "3.4.16"
version = "3.4.17"
requires-python = ">=3.9"
license = { text = "MIT License" }
classifiers = [
Expand All @@ -25,16 +25,10 @@ dependencies = ["numpy", "scipy", "astropy", "configparser",
"tqdm", "pandas", "tables", "h5py", "schwimmbad",
"matplotlib", "importlib-metadata"]


[build-system]
build-backend = 'mesonpy'
requires = ['meson-python', 'numpy']


[tool.cibuildwheel]
# Run the package tests using `pytest`
test-command = "pytest src/cosmic"

[tool.cibuildwheel.macos]
repair-wheel-command = "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}"

2 changes: 1 addition & 1 deletion src/cosmic/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "3.4.16"
__version__ = "3.4.17"

0 comments on commit 60ed167

Please sign in to comment.