Skip to content

Commit 332b712

Browse files
Enable CI on Python 3.10 (#11297)
Closes #11294
1 parent eeafe6b commit 332b712

File tree

4 files changed

+30
-23
lines changed

4 files changed

+30
-23
lines changed

.github/workflows/test.yml

+27-20
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ jobs:
5656
toxenv: py
5757
tox_extra_args: "-n 2"
5858
test_mypyc: true
59+
- name: Test suite with py310-ubuntu
60+
python: '3.10'
61+
arch: x64
62+
os: ubuntu-latest
63+
toxenv: py
64+
tox_extra_args: "-n 2"
5965
- name: mypyc runtime tests with py36-macos
6066
python: '3.6'
6167
arch: x64
@@ -96,7 +102,7 @@ jobs:
96102
./misc/build-debug-python.sh $PYTHONVERSION $PYTHONDIR $VENV
97103
source $VENV/bin/activate
98104
- name: Install tox
99-
run: pip install --upgrade 'setuptools!=50' 'virtualenv<16.7.11' tox==3.20.1
105+
run: pip install --upgrade 'setuptools!=50' 'virtualenv>=20.6.0' tox==3.20.1
100106
- name: Compiled with mypyc
101107
if: ${{ matrix.test_mypyc }}
102108
run: |
@@ -107,23 +113,24 @@ jobs:
107113
- name: Test
108114
run: tox -e ${{ matrix.toxenv }} --skip-pkg-install -- ${{ matrix.tox_extra_args }}
109115

110-
python-nightly:
111-
runs-on: ubuntu-latest
112-
name: Test suite with Python nightly
113-
steps:
114-
- uses: actions/checkout@v2
115-
- uses: actions/setup-python@v2
116-
with:
117-
python-version: '3.10-dev'
118-
- name: Install tox
119-
run: |
120-
pip install -U pip==21.2.3 setuptools
121-
pip install --upgrade 'setuptools!=50' virtualenv==20.4.7 tox==3.20.1
122-
- name: Setup tox environment
123-
run: tox -e py --notest
124-
- name: Test
125-
run: tox -e py --skip-pkg-install -- "-n 2"
126-
continue-on-error: true
127-
- name: Mark as a success
128-
run: exit 0
116+
# TODO: uncomment this when 3.11-dev is available
117+
# python-nightly:
118+
# runs-on: ubuntu-latest
119+
# name: Test suite with Python nightly
120+
# steps:
121+
# - uses: actions/checkout@v2
122+
# - uses: actions/setup-python@v2
123+
# with:
124+
# python-version: '3.11-dev'
125+
# - name: Install tox
126+
# run: |
127+
# pip install -U pip==21.2.3 setuptools
128+
# pip install --upgrade 'setuptools!=50' virtualenv==20.4.7 tox==3.20.1
129+
# - name: Setup tox environment
130+
# run: tox -e py --notest
131+
# - name: Test
132+
# run: tox -e py --skip-pkg-install -- "-n 2"
133+
# continue-on-error: true
134+
# - name: Mark as a success
135+
# run: exit 0
129136

mypyc/build.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
modules to be passed to setup. A trivial setup.py for a mypyc built
55
project, then, looks like:
66
7-
from distutils.core import setup
7+
from setuptools import setup
88
from mypyc.build import mypycify
99
1010
setup(name='test_module',

scripts/mypyc

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import sys
1919
base_path = os.path.join(os.path.dirname(__file__), '..')
2020

2121
setup_format = """\
22-
from distutils.core import setup
22+
from setuptools import setup
2323
from mypyc.build import mypycify
2424
2525
setup(name='mypyc_output',

test-data/packages/typedpkg-stubs/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
This setup file installs packages to test mypy's PEP 561 implementation
33
"""
44

5-
from distutils.core import setup
5+
from setuptools import setup
66

77
setup(
88
name='typedpkg-stubs',

0 commit comments

Comments
 (0)