Merge pull request #192 from mull-project/update_ci

CI: Drop Python 3.6 jobs
mull-project · Jan 10, 2023 · 12d4efa · 12d4efa
2 parents a4b4468 + 16b97e6
commit 12d4efa
Show file tree

Hide file tree

Showing 6 changed files with 372 additions and 351 deletions.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -8,27 +8,28 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
     - name: Upgrade pip
       run: |
         python -m pip install --upgrade pip
+        python -m pip install --upgrade setuptools
 
     - name: Install Poetry
       run: |
-        curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
+        curl -sSL https://install.python-poetry.org | python3 -
 
     - name: Add Poetry to PATH
       run: |
-        echo "PATH=$PATH:$HOME/.poetry/bin" >> $GITHUB_ENV
+        echo "PATH=$PATH:$HOME/.local/bin" >> $GITHUB_ENV
 
     - name: Install dependencies
       run: |

diff --git a/.github/workflows/ci-mac.yml b/.github/workflows/ci-mac.yml
@@ -8,13 +8,13 @@ jobs:
 
     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
+    - uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -24,11 +24,11 @@ jobs:
 
     - name: Install Poetry
       run: |
-        curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
+        curl -sSL https://install.python-poetry.org | python3 -
 
     - name: Add Poetry to PATH
       run: |
-        echo "PATH=$PATH:$HOME/.poetry/bin" >> $GITHUB_ENV
+        echo "PATH=$PATH:~/.local/bin" >> $GITHUB_ENV
 
     - name: Install dependencies
       run: |

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
@@ -1,51 +1,63 @@
 name: "FileCheck.py on Windows"
 
-on: [pull_request]
+# Disabling building on Windows for now.
+on:
+  push:
+    branches: [ "nonsense-branch" ]
+#  pull_request:
+#    branches: [ "**" ]
 
 jobs:
   build:
     runs-on: windows-latest
 
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
+    - name: "Print Debug info"
+      run: |
+        python --version
+        echo $env:USERPROFILE
+        echo $env:PATH
+        echo "$PWD"
+
     - name: Upgrade pip
       run: |
         python -m pip install --upgrade pip
 
     - name: Install Poetry
       run: |
-        (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py -UseBasicParsing).Content | python
+        (Invoke-WebRequest -Uri https://install.python-poetry.org -UseBasicParsing).Content | py -
 
     - name: "Poetry: add to %PATH%"
       run: |
-        echo "$env:USERPROFILE\.poetry\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-
-    - name: "Print Debug info"
-      run: |
-        echo $env:USERPROFILE
-        echo $env:PATH
-        echo "$PWD"
+        # Either of these should work.
+        echo "$env:APPDATA\pypoetry" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        echo "$env:APPDATA\Python\Scripts" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
     - name: "Poetry: print version"
       run: |
         poetry --version
 
     - name: "Poetry: configure settings"
       run: |
+        # https://github.com/python-poetry/poetry/issues/6098
+        poetry config virtualenvs.create true
         poetry config virtualenvs.in-project true
+        poetry config virtualenvs.prefer-active-python
 
     - name: "Poetry: Install dependencies"
       run: |
+        poetry run python --version
         poetry install
 
     - name: Run tests