Skip to content

Commit 12d4efa

Browse files
authored
Merge pull request #192 from mull-project/update_ci
CI: Drop Python 3.6 jobs
2 parents a4b4468 + 16b97e6 commit 12d4efa

File tree

6 files changed

+372
-351
lines changed

6 files changed

+372
-351
lines changed

.github/workflows/ci-linux.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,28 @@ jobs:
88

99
strategy:
1010
matrix:
11-
python-version: [3.6, 3.7, 3.8, 3.9]
11+
python-version: ["3.7", "3.8", "3.9", "3.10"]
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515

1616
- name: Set up Python ${{ matrix.python-version }}
17-
uses: actions/setup-python@v1
17+
uses: actions/setup-python@v4
1818
with:
1919
python-version: ${{ matrix.python-version }}
2020

2121
- name: Upgrade pip
2222
run: |
2323
python -m pip install --upgrade pip
24+
python -m pip install --upgrade setuptools
2425
2526
- name: Install Poetry
2627
run: |
27-
curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
28+
curl -sSL https://install.python-poetry.org | python3 -
2829
2930
- name: Add Poetry to PATH
3031
run: |
31-
echo "PATH=$PATH:$HOME/.poetry/bin" >> $GITHUB_ENV
32+
echo "PATH=$PATH:$HOME/.local/bin" >> $GITHUB_ENV
3233
3334
- name: Install dependencies
3435
run: |

.github/workflows/ci-mac.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ jobs:
88

99
strategy:
1010
matrix:
11-
python-version: [3.7, 3.8, 3.9]
11+
python-version: ["3.7", "3.8", "3.9", "3.10"]
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515

1616
- name: Set up Python ${{ matrix.python-version }}
17-
uses: actions/setup-python@v1
17+
uses: actions/setup-python@v4
1818
with:
1919
python-version: ${{ matrix.python-version }}
2020

@@ -24,11 +24,11 @@ jobs:
2424
2525
- name: Install Poetry
2626
run: |
27-
curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
27+
curl -sSL https://install.python-poetry.org | python3 -
2828
2929
- name: Add Poetry to PATH
3030
run: |
31-
echo "PATH=$PATH:$HOME/.poetry/bin" >> $GITHUB_ENV
31+
echo "PATH=$PATH:~/.local/bin" >> $GITHUB_ENV
3232
3333
- name: Install dependencies
3434
run: |

.github/workflows/ci-windows.yml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,63 @@
11
name: "FileCheck.py on Windows"
22

3-
on: [pull_request]
3+
# Disabling building on Windows for now.
4+
on:
5+
push:
6+
branches: [ "nonsense-branch" ]
7+
# pull_request:
8+
# branches: [ "**" ]
49

510
jobs:
611
build:
712
runs-on: windows-latest
813

914
strategy:
1015
matrix:
11-
python-version: [3.6, 3.7, 3.8, 3.9]
16+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
1217

1318
steps:
14-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
1520

1621
- name: Set up Python ${{ matrix.python-version }}
17-
uses: actions/setup-python@v1
22+
uses: actions/setup-python@v4
1823
with:
1924
python-version: ${{ matrix.python-version }}
2025

26+
- name: "Print Debug info"
27+
run: |
28+
python --version
29+
echo $env:USERPROFILE
30+
echo $env:PATH
31+
echo "$PWD"
32+
2133
- name: Upgrade pip
2234
run: |
2335
python -m pip install --upgrade pip
2436
2537
- name: Install Poetry
2638
run: |
27-
(Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py -UseBasicParsing).Content | python
39+
(Invoke-WebRequest -Uri https://install.python-poetry.org -UseBasicParsing).Content | py -
2840
2941
- name: "Poetry: add to %PATH%"
3042
run: |
31-
echo "$env:USERPROFILE\.poetry\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
32-
33-
- name: "Print Debug info"
34-
run: |
35-
echo $env:USERPROFILE
36-
echo $env:PATH
37-
echo "$PWD"
43+
# Either of these should work.
44+
echo "$env:APPDATA\pypoetry" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
45+
echo "$env:APPDATA\Python\Scripts" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
3846
3947
- name: "Poetry: print version"
4048
run: |
4149
poetry --version
4250
4351
- name: "Poetry: configure settings"
4452
run: |
53+
# https://github.com/python-poetry/poetry/issues/6098
54+
poetry config virtualenvs.create true
4555
poetry config virtualenvs.in-project true
56+
poetry config virtualenvs.prefer-active-python
4657
4758
- name: "Poetry: Install dependencies"
4859
run: |
60+
poetry run python --version
4961
poetry install
5062
5163
- name: Run tests

0 commit comments

Comments
 (0)