build,ci: Python 3.10.6, setup-python@v4

This was originally added in #316 but retracted due to actions/setup-python#374. In recent versions this python version issue has apparently been fixed.
vcs-python · Aug 16, 2022 · ae5c23c · ae5c23c
2 parents b19048f + 1fbdf49
commit ae5c23c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 21 deletions.
diff --git 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
@@ -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

diff --git 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
@@ -1,2 +1,2 @@
 poetry 1.1.14
-python 3.10.5 3.9.13
+python 3.10.6 3.9.13