From dc54561ba2e921bf409fcd1352708ef5854ab5d4 Mon Sep 17 00:00:00 2001 From: Tekktrik Date: Mon, 29 May 2023 15:50:03 -0400 Subject: [PATCH 1/6] Stremaline pip install commands --- build/action.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/build/action.yml b/build/action.yml index 063c25f..f987eab 100644 --- a/build/action.yml +++ b/build/action.yml @@ -59,16 +59,11 @@ runs: - name: Install pytest shell: bash run: pip install pytest - - name: Install dependencies - shell: bash - run: | - pip install -r requirements.txt - pip install -r optional_requirements.txt - name: Run pytest shell: bash run: | if [[ -d tests ]]; then - pip install . + pip install ".[optional]" pytest fi - name: Build assets From 170bd077a035ddc2db6f5bde3f6607fa1befa68b Mon Sep 17 00:00:00 2001 From: Tekktrik Date: Mon, 29 May 2023 15:53:16 -0400 Subject: [PATCH 2/6] Add step for checking packaging info --- build/action.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/action.yml b/build/action.yml index f987eab..5dae8a6 100644 --- a/build/action.yml +++ b/build/action.yml @@ -89,6 +89,10 @@ runs: shell: bash run: | echo pyproject-toml=$( find . -wholename './pyproject.toml' ) >> $GITHUB_OUTPUT + - name: Check packaging information + if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml') + shell: bash + run: python actions-ci/check_lib_packaging.py - name: Build Python package if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml') shell: bash From 03cce16d5a269b3abe871e2fb08360add891fb5d Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Wed, 7 Jun 2023 11:10:45 -0400 Subject: [PATCH 3/6] Move pytest installation --- build/action.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build/action.yml b/build/action.yml index 5dae8a6..faeab65 100644 --- a/build/action.yml +++ b/build/action.yml @@ -56,13 +56,11 @@ runs: shell: bash run: | pre-commit run --all-files - - name: Install pytest - shell: bash - run: pip install pytest - name: Run pytest shell: bash run: | if [[ -d tests ]]; then + pip install pytest pip install ".[optional]" pytest fi From 271a32194028424390eee67e125779686e0a62b9 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Thu, 25 May 2023 09:47:45 -0400 Subject: [PATCH 4/6] Fix typo in README --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index e05bae8..855537d 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ workflows-circuitpython-libs ============================ -A collection of CI workflowss for CircuitPython libraries +A collection of CI workflows for CircuitPython libraries Instructions ------------ From 76282586926e37798a51139dc1d98e65015c834a Mon Sep 17 00:00:00 2001 From: Tekktrik Date: Wed, 31 May 2023 23:27:29 -0400 Subject: [PATCH 5/6] Fix building bundles for build CI --- build/action.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/build/action.yml b/build/action.yml index faeab65..2f62286 100644 --- a/build/action.yml +++ b/build/action.yml @@ -9,6 +9,12 @@ inputs: description: 'The version of Python to use in the CI' required: true default: '3.x' + package-prefix: + description: | + The prefix (or name) of your pacakge (if applicable) to use + for GitHub releases + required: true + default: "" runs: using: "composite" steps: @@ -64,9 +70,18 @@ runs: pip install ".[optional]" pytest fi + - name: Add the given package filename_prefix + id: package-prefix-arg + shell: bash + run: | + if [ "${{ inputs.package-prefix }}" == "" ]; then + echo prefix-arg="" >> $GITHUB_OUTPUT + else + echo prefix-arg="--package_folder_prefix ${{ inputs.package-prefix }}" >> $GITHUB_OUTPUT + fi - name: Build assets shell: bash - run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . + run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . ${{ steps.package-prefix-arg.outputs.prefix-arg }} - name: Archive bundles uses: actions/upload-artifact@v3 with: From 5b2c94115e8f3390951684ec799a00d37f1a3824 Mon Sep 17 00:00:00 2001 From: Tekktrik Date: Mon, 29 May 2023 15:50:03 -0400 Subject: [PATCH 6/6] Stremaline pip install commands --- build/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/build/action.yml b/build/action.yml index 2f62286..6e2d3b5 100644 --- a/build/action.yml +++ b/build/action.yml @@ -67,7 +67,6 @@ runs: run: | if [[ -d tests ]]; then pip install pytest - pip install ".[optional]" pytest fi - name: Add the given package filename_prefix