From 1d2a3c3c0716d73ee979a4805b5e3a04f8e2c237 Mon Sep 17 00:00:00 2001 From: veenstrajelmer Date: Tue, 21 Nov 2023 16:48:12 +0100 Subject: [PATCH] updated build method --- .github/workflows/pypi-upload.yml | 3 ++- docs/CONTRIBUTING.md | 2 +- pyproject.toml | 2 -- setup.py | 6 ------ 4 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 setup.py diff --git a/.github/workflows/pypi-upload.yml b/.github/workflows/pypi-upload.yml index 3ba5b788a..793058caa 100644 --- a/.github/workflows/pypi-upload.yml +++ b/.github/workflows/pypi-upload.yml @@ -20,5 +20,6 @@ jobs: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - python setup.py sdist bdist_wheel + python -m build + twine check dist/* twine upload dist/* diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index d6bd8ec54..def1dcc05 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -69,7 +69,7 @@ mkdocs build - bump the versionnumber with ``bumpversion minor`` - update ``docs/whats-new.md`` and add a date to the current release heading - run local testbank -- local check with: ``python setup.py sdist bdist_wheel`` and ``twine check dist/*`` +- local check with: ``python -m build`` and ``twine check dist/*`` ([does not work on WCF](https://github.com/pypa/build/issues/703)) - copy the dfm_tools version from https://github.com/Deltares/dfm_tools/blob/main/pyproject.toml (e.g. ``0.11.0``) - go to https://github.com/Deltares/dfm_tools/releases/new - click ``choose a tag`` and type v+versionnumber (e.g. ``v0.11.0``), click ``create new tag: v0.11.0 on publish`` diff --git a/pyproject.toml b/pyproject.toml index 9390d57ce..45f615fe5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,8 +76,6 @@ dev = [ "pytest-cov", "twine", "build", - "setuptools", #required? - "wheel", #required? ] docs = [ "mkdocs", diff --git a/setup.py b/setup.py deleted file mode 100644 index 69c159073..000000000 --- a/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env python - -from setuptools import setup - -if __name__ == '__main__': - setup()