Skip to content

Commit

Permalink
Merge branch 'master' into release/0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
akaszynski committed Aug 3, 2022
2 parents ddb068d + 6dc02b0 commit 40d76ee
Show file tree
Hide file tree
Showing 8 changed files with 140 additions and 216 deletions.
52 changes: 52 additions & 0 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Build and upload to PyPI

on: [push, pull_request]

jobs:
build_wheels:
name: Build wheels on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, windows-2019, macos-10.15]

steps:
- uses: actions/checkout@v3

- name: Build wheels
uses: pypa/[email protected]

- uses: actions/upload-artifact@v3
with:
path: ./wheelhouse/*.whl

build_sdist:
name: Build source distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Build sdist
run: pipx run build --sdist

- uses: actions/upload-artifact@v3
with:
path: dist/*.tar.gz

upload_pypi:
needs: [build_wheels, build_sdist]
runs-on: ubuntu-latest
# upload to PyPI on every tag
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
# alternatively, to publish when a GitHub Release is created, use the following rule:
# if: github.event_name == 'release' && github.event.action == 'published'
steps:
- uses: actions/download-artifact@v3
with:
name: artifact
path: dist

- uses: pypa/[email protected]
with:
user: __token__
password: ${{ secrets.PYPI_TOKEN }}
4 changes: 1 addition & 3 deletions .github/workflows/docbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ jobs:
.ci/setup_headless_display.sh
- name: Install tetgen
run: |
pip install -r requirements_build.txt
pip install .
run: pip install .

- name: Build Documentation
run: |
Expand Down
57 changes: 0 additions & 57 deletions .github/workflows/testing-and-deployment.yml

This file was deleted.

13 changes: 12 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,18 @@ Brief description from
finite volume methods. For more information of TetGen, please take a look at a
list of `features <http://wias-berlin.de/software/tetgen/features.html>`__.

License (AGPL)
--------------

The original `TetGen <https://github.com/ufz/tetgen>`__ software is under AGPL
(see `LICENSE <https://github.com/pyvista/tetgen/blob/master/LICENSE>`_) and thus this
Python wrapper package must adopt that license as well.

Please look into the terms of this license before creating a dynamic link to this software
in your downstream package and understand commercial use limitations. We are not lawyers
and cannot provide any guidance on the terms of this license.

Please see https://www.gnu.org/licenses/agpl-3.0.en.html

Installation
------------
Expand All @@ -43,7 +55,6 @@ From source at `GitHub <https://github.com/pyvista/tetgen>`__
git clone https://github.com/pyvista/tetgen
cd tetgen
pip install -r requirements_build.txt
pip install .
Expand Down
66 changes: 0 additions & 66 deletions azure-pipelines.yml

This file was deleted.

31 changes: 31 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[build-system]
requires = [
"setuptools>=42",
"wheel>=0.33.0",
"cython>=0.29.0",
"oldest-supported-numpy"
]

build-backend = "setuptools.build_meta"

[tool.pytest.ini_options]
junit_family= "legacy"
filterwarnings = [
"ignore::FutureWarning",
"ignore::PendingDeprecationWarning",
"ignore::DeprecationWarning",
# bogus numpy ABI warning (see numpy/#432)
"ignore:.*numpy.dtype size changed.*:RuntimeWarning",
"ignore:.*numpy.ufunc size changed.*:RuntimeWarning"
]

[tool.cibuildwheel]
archs = ["auto64"] # 64-bit only
skip = "pp* *musllinux*" # disable PyPy and musl-based wheels
test-requires = "pytest pymeshfix"
test-command = "pytest {project}/tests"

[tool.cibuildwheel.macos]
# https://cibuildwheel.readthedocs.io/en/stable/faq/#apple-silicon
archs = ["x86_64", "universal2"]
test-skip = ["*_arm64", "*_universal2:arm64"]
4 changes: 0 additions & 4 deletions requirements_build.txt

This file was deleted.

Loading

0 comments on commit 40d76ee

Please sign in to comment.