diff --git a/.github/workflows/CI_pyHAMS.yml b/.github/workflows/CI_pyHAMS.yml index 16f1aa6..f702f7e 100644 --- a/.github/workflows/CI_pyHAMS.yml +++ b/.github/workflows/CI_pyHAMS.yml @@ -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 diff --git a/environment.yml b/environment.yml index e264210..92c219f 100644 --- a/environment.yml +++ b/environment.yml @@ -11,3 +11,4 @@ dependencies: - pip - pkg-config - python + - setuptools diff --git a/pyhams/meson.build b/pyhams/meson.build index ac392d4..464fbdb 100644 --- a/pyhams/meson.build +++ b/pyhams/meson.build @@ -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' +#) diff --git a/pyproject.toml b/pyproject.toml index 7b8739a..ea7d71d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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" @@ -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 @@ -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