Skip to content

Commit

Permalink
Merge branch 'master' into 8.0.x-deconflict
Browse files Browse the repository at this point in the history
  • Loading branch information
MetRonnie committed Oct 25, 2022
2 parents f25e596 + 32d2633 commit e08e8ba
Show file tree
Hide file tree
Showing 113 changed files with 3,525 additions and 6,655 deletions.
3 changes: 3 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ exclude_lines =
# Don't complain about ellipsis (exception classes, typing overloads etc):
\.\.\.

# Ignore abstract methods
@(abc\.)?abstractmethod

fail_under=0
ignore_errors = False
omit =
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_fast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fail-fast: false # Don't let a failed MacOS run stop the Ubuntu runs
matrix:
os: ['ubuntu-latest']
python-version: ['3.7', '3.8', '3.9']
python-version: ['3.7', '3.8', '3.9', '3.10']
include:
- os: 'macos-latest'
python-version: '3.7'
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/test_functional.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ jobs:
platform: ['_local_background* _local_at*']
# NOTE: includes must define ALL of the matrix values
include:
# latest python
- name: 'py-3.10'
os: 'ubuntu-latest'
python-version: '3.10'
test-base: 'tests/f'
chunk: '1/4'
platform: '_local_background*'
# tests/k
- name: 'flaky'
os: 'ubuntu-latest'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_manylinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
matrix:
manylinux: ['1']
os: ['ubuntu-18.04'] # run on the oldest linux we have access to
python-version: ['3.7', '3.8', '3.9']
python-version: ['3.7', '3.8', '3.9', '3.10']

steps:
- name: Checkout
Expand Down
Loading

0 comments on commit e08e8ba

Please sign in to comment.