Skip to content

Commit

Permalink
quick switch back to setuptools
Browse files Browse the repository at this point in the history
  • Loading branch information
gbarter committed May 23, 2024
1 parent 0ee1ee0 commit c785c7e
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI_pyHAMS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
- name: Pip Install pyHAMS
run: |
'${{ steps.cp.outputs.python-path }}' -m pip install --upgrade pip
'${{ steps.cp.outputs.python-path }}' -m pip install meson-python meson numpy ninja wheel
'${{ steps.cp.outputs.python-path }}' -m pip install meson-python meson numpy ninja wheel setuptools
'${{ steps.cp.outputs.python-path }}' -m pip install --no-build-isolation . -v
- name: Test run
Expand Down
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ dependencies:
- pip
- pkg-config
- python
- setuptools
10 changes: 5 additions & 5 deletions pyhams/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ python_sources = [
'pyhams.py',
]

py3.install_sources(
python_sources,
pure: false,
subdir: 'pyhams'
)
#py3.install_sources(
# python_sources,
# pure: false,
# subdir: 'pyhams'
#)
31 changes: 16 additions & 15 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[build-system]
build-backend = 'mesonpy'
requires = ["meson-python", "meson>=1.1", "numpy", "ninja", "wheel"]
requires = ["setuptools", "numpy", "ninja", "meson>=1.1", "wheel"]
build-backend = "setuptools.build_meta"

[project]
name = "pyHAMS"
version = "1.3.0"
version = "1.4.0"
description = "Python module wrapping around HAMS"
readme = "README.md"
requires-python = ">=3.9"
Expand Down Expand Up @@ -78,24 +78,25 @@ source = "https://github.com/WISDEM/pyHAMS"
download = "https://github.com/WISDEM/pyHAMS/releases"
tracker = "https://github.com/WISDEM/pyHAMS/issues"

[tool.meson-python.args]
setup = ['--python.install-env=auto']
install = ['--tags=runtime,python-runtime,bin']
# This is configuration specific to the `meson-python` build backend.
#[tool.meson-python.args]
#setup = ['--python.install-env=auto']
#install = ['--tags=runtime,python-runtime,bin']

# This is configuration specific to the `setuptools` build backend.
# If you are using a different build backend, you will need to change this.
#[tool.setuptools]
#zip-safe = false
#include-package-data = true
[tool.setuptools]
zip-safe = false
include-package-data = true

#[tool.setuptools.packages.find]
#exclude = ["Cylinder", "test"]
#namespaces = true
[tool.setuptools.packages.find]
exclude = ["Cylinder", "test"]
namespaces = true

#[tool.setuptools.package-data]
[tool.setuptools.package-data]
# If there are data files included in your packages that need to be
# installed, specify them here.
#"*" = ["*.yaml", "*.xlsx", "*.txt", "*.so", "*.lib", "*.pyd", "*.pdb", "*.dylib", "*.dll", "*.exe"]
"*" = ["*.yaml", "*.xlsx", "*.txt", "*.so", "*.lib", "*.pyd", "*.pdb", "*.dylib", "*.dll", "*.exe"]

[tool.black]
line-length = 120
Expand Down Expand Up @@ -135,7 +136,7 @@ atomic = true
[tool.cibuildwheel]
skip = ["pp*", "cp36-*", "cp37-*", "cp38-*", "*-win32", "*-win_arm64"] #, "*-musllinux*"]
build-frontend = { name = "build", args = ["-w","-n"] }
before-build = "pip install numpy ninja meson meson-python"
before-build = "pip install numpy ninja meson meson-python setuptools wheel"
build-verbosity = "3"

# https://github.com/pdfo/pdfo
Expand Down

0 comments on commit c785c7e

Please sign in to comment.