From 7521a3500fda008d0c0080ac6559a51464758a52 Mon Sep 17 00:00:00 2001 From: Tony Narlock Date: Tue, 16 Aug 2022 07:11:50 +0200 Subject: [PATCH 1/2] build: Bump python 3.10.5 -> 3.10.6 --- .python-version | 2 +- .tool-versions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.python-version b/.python-version index 5f6b867e..554d201c 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.10.5 3.9.13 +3.10.6 3.9.13 diff --git a/.tool-versions b/.tool-versions index b2809fa3..918a2018 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ poetry 1.1.14 -python 3.10.5 3.9.13 +python 3.10.6 3.9.13 From 1fbdf497bfcd2b820d57e3b1cd9716d2c1c4b3e0 Mon Sep 17 00:00:00 2001 From: Tony Narlock Date: Tue, 16 Aug 2022 07:15:41 +0200 Subject: [PATCH 2/2] ci(docs,tests): Try poetry cache with setup-python@v4 --- .github/workflows/docs.yml | 12 +++--------- .github/workflows/tests.yml | 13 +++---------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a2f09925..108ff2df 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -34,14 +34,10 @@ jobs: run: echo "PUBLISH=$(echo true)" >> $GITHUB_ENV - name: Install poetry - run: | - curl -O -sSL https://install.python-poetry.org/install-poetry.py - python install-poetry.py -y --version 1.1.14 - echo "PATH=${HOME}/.poetry/bin:${PATH}" >> $GITHUB_ENV - rm install-poetry.py + run: pipx install "poetry==1.1.14" - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} cache: 'poetry' @@ -50,9 +46,7 @@ jobs: run: echo "$HOME/.local/bin" >> $GITHUB_PATH - name: Install dependencies [w/ docs] - run: | - poetry env use ${{ matrix.python-version }} - poetry install --extras "docs lint" + run: poetry install --extras "docs lint" - name: Build documentation run: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 40219384..623460bc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,23 +20,16 @@ jobs: steps: - uses: actions/checkout@v3 - name: Install poetry - run: | - curl -O -sSL https://install.python-poetry.org/install-poetry.py - python install-poetry.py -y --version 1.1.14 - echo "PATH=${HOME}/.poetry/bin:${PATH}" >> $GITHUB_ENV - rm install-poetry.py + run: pipx install "poetry==1.1.14" - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} cache: 'poetry' - name: Install dependencies - run: | - # This is required to do as of @actions/checkout@v3 to prevent default python from being used - poetry env use ${{ matrix.python-version }} - poetry install -E "docs test coverage lint format" + run: poetry install -E "docs test coverage lint format" - name: Lint with flake8 run: poetry run flake8