From 5b2cd8f0774232fe5f45603a1ae70bf8ce2f1f2a Mon Sep 17 00:00:00 2001 From: umarcor Date: Thu, 16 Dec 2021 06:38:03 +0100 Subject: [PATCH 1/2] Package: support either 'build' or 'setuptools' --- .github/workflows/Package.yml | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/.github/workflows/Package.yml b/.github/workflows/Package.yml index 91a5048..a559573 100644 --- a/.github/workflows/Package.yml +++ b/.github/workflows/Package.yml @@ -33,7 +33,7 @@ on: requirements: description: 'Python dependencies to be installed through pip.' required: false - default: 'wheel' + default: '' type: string artifact: description: 'Name of the package artifact.' @@ -55,17 +55,38 @@ jobs: with: python-version: ${{ inputs.python_version }} - - name: 🔧 Install dependencies for packaging and release - run: | - python -m pip install -U pip - python -m pip install ${{ inputs.requirements }} + - name: 🐍 Update pip + run: python -m pip install -U pip - - name: 🔨 Build Python package (source distribution) + # build + + - name: 🔧 [build] Install dependencies for packaging and release + if: inputs.requirements == '' + run: python -m pip install build + + - name: 🔨 [build] Build Python package (source distribution) + if: inputs.requirements == '' + run: python -m build --sdist + + - name: 🔨 [build] Build Python package (binary distribution - wheel) + if: inputs.requirements == '' + run: python -m build --wheel + + # setuptools + + - name: 🔧 [setuptools] Install dependencies for packaging and release + if: inputs.requirements != '' + run: python -m pip install ${{ inputs.requirements }} + + - name: 🔨 [setuptools] Build Python package (source distribution) + if: inputs.requirements != '' run: python setup.py sdist - - name: 🔨 Build Python package (binary distribution - wheel) + - name: 🔨 [setuptools] Build Python package (binary distribution - wheel) + if: inputs.requirements != '' run: python setup.py bdist_wheel + - name: 📤 Upload wheel artifact uses: actions/upload-artifact@v2 with: From 9255fdf781f70950975a5ce2ea2144dced6e07d5 Mon Sep 17 00:00:00 2001 From: umarcor Date: Thu, 16 Dec 2021 06:59:16 +0100 Subject: [PATCH 2/2] Package: update description of option 'requirements --- .github/workflows/Package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Package.yml b/.github/workflows/Package.yml index a559573..a662651 100644 --- a/.github/workflows/Package.yml +++ b/.github/workflows/Package.yml @@ -31,7 +31,7 @@ on: default: '3.10' type: string requirements: - description: 'Python dependencies to be installed through pip.' + description: 'Python dependencies to be installed through pip; if empty, use pyproject.toml through build.' required: false default: '' type: string