Skip to content

Commit 48dadce

Browse files
committed
CI: get things somewhat working again
and drop mypy and py2 for now
1 parent 06cb294 commit 48dadce

File tree

3 files changed

+7
-60
lines changed

3 files changed

+7
-60
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ jobs:
77
test:
88
runs-on: ${{ matrix.os }}
99
strategy:
10+
fail-fast: false
1011
matrix:
11-
os: [ubuntu-latest, macos-latest, windows-latest]
12-
python-version: [3.5, 3.6, 3.7, 3.8, pypy3]
12+
os: [ubuntu-20.04, macos-13, windows-2019]
13+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', 'pypy3.10']
1314
steps:
1415
- uses: actions/checkout@v4
1516
- name: Set up Python ${{ matrix.python-version }}
@@ -21,7 +22,7 @@ jobs:
2122
python -m pip install --upgrade pip
2223
pip install pytest hypothesis flake8 coverage
2324
- name: Run tests on Unix
24-
if: ${{ matrix.os != 'windows-latest' }}
25+
if: ${{ matrix.os != 'windows-2019' }}
2526
run: |
2627
LANG=C LC_ALL=C python -c "import sys; print(sys.getfilesystemencoding())";
2728
LANG=C LC_ALL=C python -m coverage run --branch setup.py test
@@ -31,7 +32,7 @@ jobs:
3132
3233
python -m coverage xml -i
3334
- name: Run tests on Windows
34-
if: ${{ matrix.os == 'windows-latest' }}
35+
if: ${{ matrix.os == 'windows-2019' }}
3536
run: |
3637
python -m coverage run --branch setup.py test
3738
python -m coverage xml -i
@@ -40,57 +41,3 @@ jobs:
4041
python -m flake8
4142
- name: Upload coverage to Codecov
4243
uses: codecov/codecov-action@v5
43-
44-
test-mypy:
45-
runs-on: ${{ matrix.os }}
46-
strategy:
47-
matrix:
48-
os: [ubuntu-latest, macos-latest, windows-latest]
49-
python-version: [3.6, 3.8]
50-
steps:
51-
- uses: actions/checkout@v4
52-
- name: Set up Python ${{ matrix.python-version }}
53-
uses: actions/setup-python@v5
54-
with:
55-
python-version: ${{ matrix.python-version }}
56-
- name: Install dependencies
57-
run: |
58-
python -m pip install --upgrade pip
59-
pip install mypy
60-
- name: Run mypy
61-
run: |
62-
python -m mypy .
63-
64-
test-py2:
65-
runs-on: ${{ matrix.os }}
66-
strategy:
67-
matrix:
68-
os: [ubuntu-latest, macos-latest, windows-latest]
69-
python-version: [2.7]
70-
steps:
71-
- uses: actions/checkout@v4
72-
- name: Set up Python ${{ matrix.python-version }}
73-
uses: actions/setup-python@v5
74-
with:
75-
python-version: ${{ matrix.python-version }}
76-
- name: Install dependencies
77-
run: |
78-
python -m pip install --upgrade pip
79-
pip install pytest hypothesis coverage typing
80-
- name: Run tests on Unix
81-
if: ${{ matrix.os != 'windows-latest' }}
82-
run: |
83-
LANG=C LC_ALL=C python -c "import sys; print(sys.getfilesystemencoding())";
84-
LANG=C LC_ALL=C python -m coverage run --branch setup.py test
85-
86-
LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 python -c "import sys; print(sys.getfilesystemencoding())";
87-
LANG=C LC_ALL=C python -m coverage run --append --branch setup.py test
88-
89-
python -m coverage xml -i
90-
- name: Run tests on Windows
91-
if: ${{ matrix.os == 'windows-latest' }}
92-
run: |
93-
python -m coverage run --branch setup.py test
94-
python -m coverage xml -i
95-
- name: Upload coverage to Codecov
96-
uses: codecov/codecov-action@v5

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def run(self):
5252

5353
for key in list(sys.modules.keys()):
5454
if key.startswith('senf'):
55-
del(sys.modules[key])
55+
del sys.modules[key]
5656

5757
cov = coverage()
5858
cov.start()

tests/test_hypo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import os
2424
import platform
25-
from typing import Text, List
25+
from typing import Text, List # noqa
2626

2727
import pytest
2828
from hypothesis import given, strategies, settings, HealthCheck

0 commit comments

Comments
 (0)