Skip to content

Commit aa35d3d

Browse files
authored
Merge pull request #249 from python-greenlet/310rc1
Update to Python 3.10rc1
2 parents c8ab6ad + 1a89ae4 commit aa35d3d

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

.github/workflows/tests.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ${{ matrix.os }}
2424
strategy:
2525
matrix:
26-
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10.0-beta.1]
26+
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10.0-rc.1]
2727
os: [ubuntu-latest, macos-latest]
2828
steps:
2929
- uses: actions/checkout@v2
@@ -58,6 +58,11 @@ jobs:
5858
- name: Test
5959
run: |
6060
python -m unittest discover -v greenlet.tests
61+
- name: Doctest
62+
# FIXME: This conditional can go away when a Sphinx greater than 4.1.2
63+
# is released. See https://github.com/sphinx-doc/sphinx/issues/9512
64+
if: matrix.python-version != '3.10.0-rc.1'
65+
run: |
6166
sphinx-build -b doctest -d docs/_build/doctrees2 docs docs/_build/doctest2
6267
- name: Publish package to PyPI (mac)
6368
# We cannot 'uses: pypa/gh-action-pypi-publish@v1.4.1' because

CHANGES.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
1.1.1 (unreleased)
66
==================
77

8-
- Nothing changed yet.
8+
- Provide Windows binary wheels for Python 3.10 (64-bit only).
9+
10+
- Update Python 3.10 wheels to be built against 3.10rc1, where
11+
applicable.
912

1013

1114
1.1.0 (2021-05-06)

appveyor.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ environment:
3333

3434
matrix:
3535
# http://www.appveyor.com/docs/installed-software#python
36+
- PYTHON: "C:\\Python310-x64"
37+
PYTHON_VERSION: "3.10.0rc1"
38+
PYTHON_ARCH: "64"
39+
PYTHON_EXE: python
40+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
3641

3742
- PYTHON: "C:\\Python39-x64"
3843
PYTHON_ARCH: "64"
@@ -161,7 +166,8 @@ build_script:
161166

162167
test_script:
163168
- "%CMD_IN_ENV% python -m unittest discover -v greenlet.tests"
164-
- "%CMD_IN_ENV% python -m sphinx -b doctest -d docs/_build/doctrees docs docs/_build/doctest"
169+
# XXX: Doctest disabled pending sphinx release for 3.10; see tests.yml.
170+
# - "%CMD_IN_ENV% python -m sphinx -b doctest -d docs/_build/doctrees docs docs/_build/doctest"
165171

166172
after_test:
167173
- "%CMD_IN_ENV% python setup.py bdist_wheel"

0 commit comments

Comments
 (0)