From 0c6185ee3c5ea5270dc29a2e5e5e4fa51c4f6ca0 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Mon, 22 Aug 2022 17:50:58 -0400 Subject: [PATCH 01/45] ci: updated ubuntu runner version --- .github/workflows/release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 32c506d1..55ee8f35 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,12 +1,14 @@ -name: Release +name: GitHub Release + on: push: branches: - master + jobs: release: name: Release - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v1 From f24325fd2ffbf35b1b48156958f445af37085fbf Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Mon, 22 Aug 2022 17:50:58 -0400 Subject: [PATCH 02/45] ci: cleaned publish workflow --- .github/workflows/publish.yml | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 203cddcf..f2bb309e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,26 +1,26 @@ -name: Publish +name: Publish to PyPI on: release: - types: [created] + types: + - created jobs: deploy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.x' - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install poetry - - name: Build and publish - run: | - poetry version $(git describe --tags --abbrev=0) - poetry build - poetry publish --username ${{ secrets.PYPI_USERNAME }} --password ${{ secrets.PYPI_PASSWORD }} + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: "3.x" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install poetry + - name: Build and publish + run: | + poetry version $(git describe --tags --abbrev=0) + poetry build + poetry publish \ + --username ${{ secrets.PYPI_USERNAME }} \ + --password ${{ secrets.PYPI_PASSWORD }} From ff1cee87dd0d6d1a500e1fdb38650a9c4ba7319b Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Wed, 17 Aug 2022 21:32:18 -0400 Subject: [PATCH 03/45] ci: cleaned test workflow --- .github/workflows/test.yml | 120 +++++++++++++++++++++++++++---------- 1 file changed, 89 insertions(+), 31 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 13b07a8c..ed41c8fa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,44 +2,102 @@ name: Test on: push: - branches: [ master ] + branches: + - master pull_request: - branches: [ master ] + branches: + - master jobs: - build: + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: "3.x" + - name: Install system dependencies + run: | + python -m pip install --upgrade pip + pip install poetry + - name: Install package dependencies + run: | + poetry install + - name: Run linting checks + run: | + make lint + test-examples: runs-on: ubuntu-latest strategy: matrix: +<<<<<<< HEAD python-version: [3.7, 3.8] +======= + python-version: + - 3.7 + - 3.8 + - 3.9 + - 3.10 + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install system dependencies + run: | + python -m pip install --upgrade pip + pip install poetry + - name: Install package dependencies + run: | + poetry install --no-dev + - name: Test example + run: | + poetry run python examples/basic_usage.py +>>>>>>> ci: cleaned test workflow + test-unit: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: + - 3.7 + - 3.8 + - 3.9 + - 3.10 + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install system dependencies + run: | + python -m pip install --upgrade pip + pip install poetry + - name: Install package + dev dependencies + run: | + poetry install + - name: Unit testing + run: | + make test + + test-notebooks: + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Install system dependencies - run: | - sudo apt-get install gcc gfortran libopenblas-dev liblapack-dev cython - python -m pip install --upgrade pip - pip install poetry - - name: Install core dependencies - run: | - poetry install --no-dev - - name: Test example - run: | - poetry run python examples/basic_usage.py - - name: Install dev dependencies - run: | - poetry install - - name: Run linting checks - run: | - make check - - name: Run unit tests - run: | - make test - - name: Run notebook tests - run: | - make test-notebooks + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: "3.x" + - name: Install system dependencies + run: | + python -m pip install --upgrade pip + pip install poetry + - name: Install package + notebook dependencies + run: | + poetry install + - name: Test notebooks + run: | + make test-notebooks From c1367eeb29c2eaee226feff79fc1ca9755d633df Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Thu, 18 Aug 2022 16:42:51 -0400 Subject: [PATCH 04/45] ci: using makefile command --- .github/workflows/test.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ed41c8fa..ebbba9a6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,9 +31,6 @@ jobs: runs-on: ubuntu-latest strategy: matrix: -<<<<<<< HEAD - python-version: [3.7, 3.8] -======= python-version: - 3.7 - 3.8 @@ -54,8 +51,7 @@ jobs: poetry install --no-dev - name: Test example run: | - poetry run python examples/basic_usage.py ->>>>>>> ci: cleaned test workflow + make test-examples test-unit: runs-on: ubuntu-latest From 8870ce94d944fae8dc761fbb18cc6b1a6e4ea055 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Thu, 18 Aug 2022 16:44:44 -0400 Subject: [PATCH 05/45] ci: fixed yaml py version numbers --- .github/workflows/test.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ebbba9a6..463676e4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,10 +32,10 @@ jobs: strategy: matrix: python-version: - - 3.7 - - 3.8 - - 3.9 - - 3.10 + - "3.7" + - "3.8" + - "3.9" + - "3.10" steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -58,10 +58,10 @@ jobs: strategy: matrix: python-version: - - 3.7 - - 3.8 - - 3.9 - - 3.10 + - "3.7" + - "3.8" + - "3.9" + - "3.10" steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} From e95b715641aae944cdd0887750c49f5b35599f8d Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Thu, 18 Aug 2022 16:47:26 -0400 Subject: [PATCH 06/45] ci: removed unneeded install --- .github/workflows/publish.yml | 1 - .github/workflows/test.yml | 4 ---- 2 files changed, 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f2bb309e..05455847 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,6 @@ jobs: python-version: "3.x" - name: Install dependencies run: | - python -m pip install --upgrade pip pip install poetry - name: Build and publish run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 463676e4..8d328697 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,6 @@ jobs: python-version: "3.x" - name: Install system dependencies run: | - python -m pip install --upgrade pip pip install poetry - name: Install package dependencies run: | @@ -44,7 +43,6 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install system dependencies run: | - python -m pip install --upgrade pip pip install poetry - name: Install package dependencies run: | @@ -70,7 +68,6 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install system dependencies run: | - python -m pip install --upgrade pip pip install poetry - name: Install package + dev dependencies run: | @@ -89,7 +86,6 @@ jobs: python-version: "3.x" - name: Install system dependencies run: | - python -m pip install --upgrade pip pip install poetry - name: Install package + notebook dependencies run: | From 7c5ef1a8b82954f1fd407421ba8ae03d9f11bcf3 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Thu, 18 Aug 2022 17:58:53 -0400 Subject: [PATCH 07/45] ci: reduced number of steps --- .github/workflows/test.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8d328697..8082748d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,11 +16,9 @@ jobs: - uses: actions/setup-python@v2 with: python-version: "3.x" - - name: Install system dependencies + - name: Install dependencies run: | pip install poetry - - name: Install package dependencies - run: | poetry install - name: Run linting checks run: | @@ -66,11 +64,9 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Install system dependencies + - name: Install dependencies run: | pip install poetry - - name: Install package + dev dependencies - run: | poetry install - name: Unit testing run: | @@ -84,12 +80,10 @@ jobs: uses: actions/setup-python@v2 with: python-version: "3.x" - - name: Install system dependencies + - name: Install dependencies run: | pip install poetry - - name: Install package + notebook dependencies - run: | - poetry install + poetry install -E notebooks - name: Test notebooks run: | make test-notebooks From f2616ccbd21f4ce77b086d905badfaba8f675d5f Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 19 Aug 2022 10:35:21 -0400 Subject: [PATCH 08/45] ci: bumped to actions/checkout@v3 --- .github/workflows/publish.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 05455847..a6b450de 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,7 +9,7 @@ jobs: deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v2 with: python-version: "3.x" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 55ee8f35..fb94611c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v3 - name: Setup Node.js uses: actions/setup-node@v1 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8082748d..35a0a4d4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v2 with: python-version: "3.x" From 49078ed2d6bcb45fe641fd97774f45ecd197de36 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 19 Aug 2022 10:36:43 -0400 Subject: [PATCH 09/45] ci: bumped to actions/setup-python@v4 --- .github/workflows/publish.yml | 2 +- .github/workflows/test.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a6b450de..32046e3b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: "3.x" - name: Install dependencies diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 35a0a4d4..d6a56433 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: "3.x" - name: Install dependencies @@ -36,7 +36,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install system dependencies @@ -61,7 +61,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -77,7 +77,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: "3.x" - name: Install dependencies From ed39a0e5af5b4d618a9112a0554a804ba176f135 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 19 Aug 2022 10:36:57 -0400 Subject: [PATCH 10/45] ci: bumped to actions/checkout@v3 --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d6a56433..d0f76e8d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,7 +34,7 @@ jobs: - "3.9" - "3.10" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: @@ -59,7 +59,7 @@ jobs: - "3.9" - "3.10" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: @@ -75,7 +75,7 @@ jobs: test-notebooks: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: From d152c389181de3549816f0b1edcc65400d4e5a9c Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Mon, 22 Aug 2022 18:00:22 -0400 Subject: [PATCH 11/45] ci: only dev deps needed for linting --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d0f76e8d..61eeb81a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,8 @@ jobs: - name: Install dependencies run: | pip install poetry - poetry install + # TODO: use linting dev group? #798 + poetry install --dev-only - name: Run linting checks run: | make lint From 02954000a15345af101d390fffc8e82015445288 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Mon, 22 Aug 2022 18:01:53 -0400 Subject: [PATCH 12/45] ci: reduced number of steps --- .github/workflows/test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 61eeb81a..4f827816 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,11 +40,9 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - - name: Install system dependencies + - name: Install dependencies run: | pip install poetry - - name: Install package dependencies - run: | poetry install --no-dev - name: Test example run: | From fb0550e7f2dbfdd5facc7610e555c26bc116302c Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Mon, 22 Aug 2022 18:02:09 -0400 Subject: [PATCH 13/45] ci: removed optional flag --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4f827816..f012aa8d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -82,7 +82,7 @@ jobs: - name: Install dependencies run: | pip install poetry - poetry install -E notebooks + poetry install - name: Test notebooks run: | make test-notebooks From 27c0badd53a9bf0a4e578ebb14364c0dbdbe1ccb Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Mon, 22 Aug 2022 18:03:14 -0400 Subject: [PATCH 14/45] docs: added comments --- .github/workflows/publish.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 32046e3b..e6e48aee 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,7 +18,9 @@ jobs: pip install poetry - name: Build and publish run: | + # bump local package version to match git tag poetry version $(git describe --tags --abbrev=0) + # build and publish package poetry build poetry publish \ --username ${{ secrets.PYPI_USERNAME }} \ From 0acfa4c604df15555ad0323330410bb1e0aa3b0b Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 26 Aug 2022 16:50:50 -0400 Subject: [PATCH 15/45] ci: removed future --dev-only flag --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f012aa8d..9c2a004d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,8 @@ jobs: run: | pip install poetry # TODO: use linting dev group? #798 - poetry install --dev-only + # TODO: use ` --dev-only` from next poetry release? + poetry install - name: Run linting checks run: | make lint From 39964dd18c87bbf9108c507cebf4e1879c3aff6e Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 26 Aug 2022 16:52:43 -0400 Subject: [PATCH 16/45] ci: lint across all supported py versions --- .github/workflows/test.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9c2a004d..eda69477 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,11 +11,19 @@ on: jobs: lint: runs-on: ubuntu-latest + strategy: + matrix: + python-version: + - "3.7" + - "3.8" + - "3.9" + - "3.10" steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 with: - python-version: "3.x" + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | pip install poetry From 451a7406dc18f530211090e6e644800c7a48e6f1 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 26 Aug 2022 17:08:45 -0400 Subject: [PATCH 17/45] ci: test building and installing --- .github/workflows/test.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eda69477..77a8d316 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,6 +34,36 @@ jobs: run: | make lint + test-build-and-installs: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: + - "3.7" + - "3.8" + - "3.9" + - "3.10" + steps: + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + pip install poetry + - name: Run build + run: | + make build + - name: Run installs + run: | + # test local install + pip install --no-deps --force-reinstall . + # test wheel + pip install --no-deps --force-reinstall dist/*.whl + # test tarball + pip install --no-deps --force-reinstall dist/*.tar.gz + test-examples: runs-on: ubuntu-latest strategy: From bff280ae0936ef01f3eb223f034f648822386602 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 26 Aug 2022 17:09:02 -0400 Subject: [PATCH 18/45] docs: added ci comments --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e6e48aee..4d8d6362 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,6 +12,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: + # use latest stable python version for publishing python-version: "3.x" - name: Install dependencies run: | From 1981962d16c5d3986be4a77996341aefede4e04f Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 26 Aug 2022 17:09:26 -0400 Subject: [PATCH 19/45] build: using consistent make command to build --- .github/workflows/publish.yml | 5 +---- Makefile | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4d8d6362..c56f7922 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,10 +19,7 @@ jobs: pip install poetry - name: Build and publish run: | - # bump local package version to match git tag - poetry version $(git describe --tags --abbrev=0) - # build and publish package - poetry build + make build poetry publish \ --username ${{ secrets.PYPI_USERNAME }} \ --password ${{ secrets.PYPI_PASSWORD }} diff --git a/Makefile b/Makefile index 5bda0ef3..17ef0b51 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,8 @@ test-examples: examples/*.py .PHONY: build build: + # bump local package version to match git tag and build package + poetry version $(shell git describe --tags --abbrev=0) poetry build .PHONY: paper From 16e3e9627b1bd60d23be62e11622e7018821ab1f Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 26 Aug 2022 17:09:49 -0400 Subject: [PATCH 20/45] build: syncing package version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8836288d..630007a6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pybotics" -version = "0.0.0" +version = "2.0.1" description = "Python Toolbox for Robotics" authors = ["Nicholas Nadeau "] readme = "README.md" From 8afa916e8ccd803eac07fda647dbe28e2ae736fa Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 26 Aug 2022 22:59:17 -0400 Subject: [PATCH 21/45] ci: running quick jobs first --- .github/workflows/test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 77a8d316..eba9461f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -88,6 +88,8 @@ jobs: make test-examples test-unit: + needs: + - test-examxples runs-on: ubuntu-latest strategy: matrix: @@ -111,6 +113,9 @@ jobs: make test test-notebooks: + needs: + - test-unit + - test-examples runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From 9ce5f7fb1a7b41456c91d33b4ae88d79200a5c87 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 26 Aug 2022 23:00:12 -0400 Subject: [PATCH 22/45] build: added helper test function --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 17ef0b51..a9b4c825 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,9 @@ format: poetry run black . poetry run isort . +.PHONY: test-all +test-all: test test-examples test-notebooks + .PHONY: test test: PYTHONPATH=. \ From 978d61e493e69d8ea57b8e591488239d6a313af5 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Tue, 30 Aug 2022 00:08:13 -0400 Subject: [PATCH 23/45] ci: updated ubuntu runner version --- .github/workflows/release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 32c506d1..55ee8f35 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,12 +1,14 @@ -name: Release +name: GitHub Release + on: push: branches: - master + jobs: release: name: Release - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v1 From e2d99783d7ffff0de9092c350383800413e32742 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Tue, 30 Aug 2022 00:08:13 -0400 Subject: [PATCH 24/45] ci: cleaned publish workflow --- .github/workflows/publish.yml | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 203cddcf..f2bb309e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,26 +1,26 @@ -name: Publish +name: Publish to PyPI on: release: - types: [created] + types: + - created jobs: deploy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.x' - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install poetry - - name: Build and publish - run: | - poetry version $(git describe --tags --abbrev=0) - poetry build - poetry publish --username ${{ secrets.PYPI_USERNAME }} --password ${{ secrets.PYPI_PASSWORD }} + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: "3.x" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install poetry + - name: Build and publish + run: | + poetry version $(git describe --tags --abbrev=0) + poetry build + poetry publish \ + --username ${{ secrets.PYPI_USERNAME }} \ + --password ${{ secrets.PYPI_PASSWORD }} From d33e4eb6fc5c98a2217a56b5a0ed3c0d2b20a066 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Wed, 17 Aug 2022 21:32:18 -0400 Subject: [PATCH 25/45] ci: cleaned test workflow --- .github/workflows/test.yml | 81 ++++++++++++++++++++++++++++++++------ 1 file changed, 68 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8e3d5420..4ae42590 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,17 +2,40 @@ name: Test on: push: - branches: [master] + branches: + - master pull_request: - branches: [master] + branches: + - master jobs: - build: + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: "3.x" + - name: Install system dependencies + run: | + python -m pip install --upgrade pip + pip install poetry + - name: Install package dependencies + run: | + poetry install + - name: Run linting checks + run: | + make lint + + test-examples: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9] - + python-version: + - 3.7 + - 3.8 + - 3.9 + - 3.10 steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -21,24 +44,56 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install system dependencies run: | - sudo apt-get install gcc gfortran libopenblas-dev liblapack-dev cython python -m pip install --upgrade pip pip install poetry - - name: Install core dependencies + - name: Install package dependencies run: | poetry install --no-dev - name: Test example run: | poetry run python examples/basic_usage.py - - name: Install dev dependencies + + test-unit: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: + - 3.7 + - 3.8 + - 3.9 + - 3.10 + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install system dependencies run: | - poetry install - - name: Run linting checks + python -m pip install --upgrade pip + pip install poetry + - name: Install package + dev dependencies run: | - make check - - name: Run unit tests + poetry install + - name: Unit testing run: | make test - - name: Run notebook tests + + test-notebooks: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: "3.x" + - name: Install system dependencies + run: | + python -m pip install --upgrade pip + pip install poetry + - name: Install package + notebook dependencies + run: | + poetry install + - name: Test notebooks run: | make test-notebooks From 779fa1a6edf89162317986785e09328b39eaedbf Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Thu, 18 Aug 2022 16:42:51 -0400 Subject: [PATCH 26/45] ci: using makefile command --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4ae42590..ebbba9a6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -51,7 +51,7 @@ jobs: poetry install --no-dev - name: Test example run: | - poetry run python examples/basic_usage.py + make test-examples test-unit: runs-on: ubuntu-latest From f8f32abe9e5b0d4153e9928c9dfcccd92bbade95 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Thu, 18 Aug 2022 16:44:44 -0400 Subject: [PATCH 27/45] ci: fixed yaml py version numbers --- .github/workflows/test.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ebbba9a6..463676e4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,10 +32,10 @@ jobs: strategy: matrix: python-version: - - 3.7 - - 3.8 - - 3.9 - - 3.10 + - "3.7" + - "3.8" + - "3.9" + - "3.10" steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -58,10 +58,10 @@ jobs: strategy: matrix: python-version: - - 3.7 - - 3.8 - - 3.9 - - 3.10 + - "3.7" + - "3.8" + - "3.9" + - "3.10" steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} From 1dcd5e5d99943ff82b71834cc395629e1a688747 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Thu, 18 Aug 2022 16:47:26 -0400 Subject: [PATCH 28/45] ci: removed unneeded install --- .github/workflows/publish.yml | 1 - .github/workflows/test.yml | 4 ---- 2 files changed, 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f2bb309e..05455847 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,6 @@ jobs: python-version: "3.x" - name: Install dependencies run: | - python -m pip install --upgrade pip pip install poetry - name: Build and publish run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 463676e4..8d328697 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,6 @@ jobs: python-version: "3.x" - name: Install system dependencies run: | - python -m pip install --upgrade pip pip install poetry - name: Install package dependencies run: | @@ -44,7 +43,6 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install system dependencies run: | - python -m pip install --upgrade pip pip install poetry - name: Install package dependencies run: | @@ -70,7 +68,6 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install system dependencies run: | - python -m pip install --upgrade pip pip install poetry - name: Install package + dev dependencies run: | @@ -89,7 +86,6 @@ jobs: python-version: "3.x" - name: Install system dependencies run: | - python -m pip install --upgrade pip pip install poetry - name: Install package + notebook dependencies run: | From 096fdc35bc4fdf9df19f86140be7d90a31626755 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Thu, 18 Aug 2022 17:58:53 -0400 Subject: [PATCH 29/45] ci: reduced number of steps --- .github/workflows/test.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8d328697..8082748d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,11 +16,9 @@ jobs: - uses: actions/setup-python@v2 with: python-version: "3.x" - - name: Install system dependencies + - name: Install dependencies run: | pip install poetry - - name: Install package dependencies - run: | poetry install - name: Run linting checks run: | @@ -66,11 +64,9 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Install system dependencies + - name: Install dependencies run: | pip install poetry - - name: Install package + dev dependencies - run: | poetry install - name: Unit testing run: | @@ -84,12 +80,10 @@ jobs: uses: actions/setup-python@v2 with: python-version: "3.x" - - name: Install system dependencies + - name: Install dependencies run: | pip install poetry - - name: Install package + notebook dependencies - run: | - poetry install + poetry install -E notebooks - name: Test notebooks run: | make test-notebooks From 434587b8bdb8bf568f503bd846b966815656d65e Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 19 Aug 2022 10:35:21 -0400 Subject: [PATCH 30/45] ci: bumped to actions/checkout@v3 --- .github/workflows/publish.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 05455847..a6b450de 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,7 +9,7 @@ jobs: deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v2 with: python-version: "3.x" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 55ee8f35..fb94611c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v3 - name: Setup Node.js uses: actions/setup-node@v1 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8082748d..35a0a4d4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v2 with: python-version: "3.x" From 06d5182273981849ae1f04c95e1ee09766c67dd3 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 19 Aug 2022 10:36:43 -0400 Subject: [PATCH 31/45] ci: bumped to actions/setup-python@v4 --- .github/workflows/publish.yml | 2 +- .github/workflows/test.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a6b450de..32046e3b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: "3.x" - name: Install dependencies diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 35a0a4d4..d6a56433 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: "3.x" - name: Install dependencies @@ -36,7 +36,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install system dependencies @@ -61,7 +61,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -77,7 +77,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: "3.x" - name: Install dependencies From 5c347a144a9e2533a4b5efe039a676a414a31a5c Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 19 Aug 2022 10:36:57 -0400 Subject: [PATCH 32/45] ci: bumped to actions/checkout@v3 --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d6a56433..d0f76e8d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,7 +34,7 @@ jobs: - "3.9" - "3.10" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: @@ -59,7 +59,7 @@ jobs: - "3.9" - "3.10" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: @@ -75,7 +75,7 @@ jobs: test-notebooks: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: From a443d7f96c2d8a025f2d13cb6906cf719d6d0b83 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Mon, 22 Aug 2022 18:00:22 -0400 Subject: [PATCH 33/45] ci: only dev deps needed for linting --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d0f76e8d..61eeb81a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,8 @@ jobs: - name: Install dependencies run: | pip install poetry - poetry install + # TODO: use linting dev group? #798 + poetry install --dev-only - name: Run linting checks run: | make lint From a84d3e31a3d1174d70eecfc50211ae7b07b849c8 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Mon, 22 Aug 2022 18:01:53 -0400 Subject: [PATCH 34/45] ci: reduced number of steps --- .github/workflows/test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 61eeb81a..4f827816 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,11 +40,9 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - - name: Install system dependencies + - name: Install dependencies run: | pip install poetry - - name: Install package dependencies - run: | poetry install --no-dev - name: Test example run: | From 1a4dd8504645c5e380eff4e69bb7ca275f636f4a Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Mon, 22 Aug 2022 18:02:09 -0400 Subject: [PATCH 35/45] ci: removed optional flag --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4f827816..f012aa8d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -82,7 +82,7 @@ jobs: - name: Install dependencies run: | pip install poetry - poetry install -E notebooks + poetry install - name: Test notebooks run: | make test-notebooks From 5c2e30c3972e733b1dac6e36ad92ef35aee39cc3 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Mon, 22 Aug 2022 18:03:14 -0400 Subject: [PATCH 36/45] docs: added comments --- .github/workflows/publish.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 32046e3b..e6e48aee 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,7 +18,9 @@ jobs: pip install poetry - name: Build and publish run: | + # bump local package version to match git tag poetry version $(git describe --tags --abbrev=0) + # build and publish package poetry build poetry publish \ --username ${{ secrets.PYPI_USERNAME }} \ From de391c0f9a5a80d59f63ab2f61dc8eb1d2389818 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 26 Aug 2022 16:50:50 -0400 Subject: [PATCH 37/45] ci: removed future --dev-only flag --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f012aa8d..9c2a004d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,8 @@ jobs: run: | pip install poetry # TODO: use linting dev group? #798 - poetry install --dev-only + # TODO: use ` --dev-only` from next poetry release? + poetry install - name: Run linting checks run: | make lint From 06a7469b28636821fbfe92d9f0ee82ca2357814c Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 26 Aug 2022 16:52:43 -0400 Subject: [PATCH 38/45] ci: lint across all supported py versions --- .github/workflows/test.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9c2a004d..eda69477 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,11 +11,19 @@ on: jobs: lint: runs-on: ubuntu-latest + strategy: + matrix: + python-version: + - "3.7" + - "3.8" + - "3.9" + - "3.10" steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 with: - python-version: "3.x" + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | pip install poetry From a570e6f1ec286656a77143aeed56461678da562f Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 26 Aug 2022 17:08:45 -0400 Subject: [PATCH 39/45] ci: test building and installing --- .github/workflows/test.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eda69477..77a8d316 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,6 +34,36 @@ jobs: run: | make lint + test-build-and-installs: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: + - "3.7" + - "3.8" + - "3.9" + - "3.10" + steps: + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + pip install poetry + - name: Run build + run: | + make build + - name: Run installs + run: | + # test local install + pip install --no-deps --force-reinstall . + # test wheel + pip install --no-deps --force-reinstall dist/*.whl + # test tarball + pip install --no-deps --force-reinstall dist/*.tar.gz + test-examples: runs-on: ubuntu-latest strategy: From 841536366d3b7202cb5bd0284d638e0f6754e647 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 26 Aug 2022 17:09:02 -0400 Subject: [PATCH 40/45] docs: added ci comments --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e6e48aee..4d8d6362 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,6 +12,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: + # use latest stable python version for publishing python-version: "3.x" - name: Install dependencies run: | From 28529d8177ea0e821d35d249e0c865fe45dadc7b Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 26 Aug 2022 17:09:26 -0400 Subject: [PATCH 41/45] build: using consistent make command to build --- .github/workflows/publish.yml | 5 +---- Makefile | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4d8d6362..c56f7922 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,10 +19,7 @@ jobs: pip install poetry - name: Build and publish run: | - # bump local package version to match git tag - poetry version $(git describe --tags --abbrev=0) - # build and publish package - poetry build + make build poetry publish \ --username ${{ secrets.PYPI_USERNAME }} \ --password ${{ secrets.PYPI_PASSWORD }} diff --git a/Makefile b/Makefile index 50ca2332..db00fb2a 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,8 @@ test-examples: examples/*.py .PHONY: build build: + # bump local package version to match git tag and build package + poetry version $(shell git describe --tags --abbrev=0) poetry build .PHONY: paper From f5802f85309b08492201a86eddce617d77387477 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 26 Aug 2022 17:09:49 -0400 Subject: [PATCH 42/45] build: syncing package version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d457a862..7c557f15 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pybotics" -version = "0.0.0" +version = "2.0.1" description = "Python Toolbox for Robotics" authors = ["Nicholas Nadeau "] readme = "README.md" From e8747f3ba8fa17ac46c6e38216a0e2e1a1977204 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 26 Aug 2022 22:59:17 -0400 Subject: [PATCH 43/45] ci: running quick jobs first --- .github/workflows/test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 77a8d316..eba9461f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -88,6 +88,8 @@ jobs: make test-examples test-unit: + needs: + - test-examxples runs-on: ubuntu-latest strategy: matrix: @@ -111,6 +113,9 @@ jobs: make test test-notebooks: + needs: + - test-unit + - test-examples runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From 53b03c2a8cb1dc3e96eb388078c0d05121d4f88b Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Fri, 26 Aug 2022 23:00:12 -0400 Subject: [PATCH 44/45] build: added helper test function --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index db00fb2a..e500702d 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,9 @@ format: poetry run black . poetry run isort . +.PHONY: test-all +test-all: test test-examples test-notebooks + .PHONY: test test: PYTHONPATH=. \ From 77755cc5c4e2fd59d9ac6e00c87c2edee5839268 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Tue, 30 Aug 2022 00:27:32 -0400 Subject: [PATCH 45/45] ci: removed `needs` flag; cycle in the dep graph --- .github/workflows/test.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eba9461f..77a8d316 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -88,8 +88,6 @@ jobs: make test-examples test-unit: - needs: - - test-examxples runs-on: ubuntu-latest strategy: matrix: @@ -113,9 +111,6 @@ jobs: make test test-notebooks: - needs: - - test-unit - - test-examples runs-on: ubuntu-latest steps: - uses: actions/checkout@v3