From 1461bd9b22bcc6781459e1c8d13aacbcc4272942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Kl=C3=B6ffel?= <145490354+christophkloeffel@users.noreply.github.com> Date: Mon, 14 Oct 2024 16:37:15 +0200 Subject: [PATCH] uses build instead of invoking setup.py directly (#107) --- .github/workflows/package.yml | 10 +++++----- Makefile | 2 +- requirements_dev.txt | 1 + setup.py | 4 +--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index c5f5a387..6e73964c 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -15,18 +15,18 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python 3.9 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.9" - name: Install dependencies run: | - python -m pip install --upgrade pip - python -m pip install --upgrade setuptools wheel requests + python3 -m pip install --upgrade pip + python3 -m pip install build - name: run: | make package - name: Archive wheel files - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: "dist/trlc-*.whl" @@ -40,7 +40,7 @@ jobs: id-token: write steps: - name: Download wheel files - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: wheels path: dist diff --git a/Makefile b/Makefile index 7c6516cb..062cc6e6 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ docs: package: @git clean -xdf - @python3 setup.py sdist bdist_wheel + @python3 -m build upload-main: package python3 -m twine upload --repository pypi dist/* diff --git a/requirements_dev.txt b/requirements_dev.txt index 9b2fce1c..85117e90 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -3,3 +3,4 @@ pycodestyle==2.12.0 pylint==3.2.4 coverage>=7.2 sphinx>=7.0 +build>=1.2.0 diff --git a/setup.py b/setup.py index 5b843df3..758b94d4 100644 --- a/setup.py +++ b/setup.py @@ -53,8 +53,6 @@ "Topic :: Software Development", ], entry_points={ - "console_scripts": [ - "trlc = trlc.trlc:main", - ], + "console_scripts": ["trlc = trlc.trlc:main"], }, )