Skip to content

Commit

Permalink
Merge pull request #249 from python-greenlet/310rc1
Browse files Browse the repository at this point in the history
Update to Python 3.10rc1
  • Loading branch information
jamadden committed Aug 6, 2021
2 parents c8ab6ad + 1a89ae4 commit aa35d3d
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10.0-beta.1]
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10.0-rc.1]
os: [ubuntu-latest, macos-latest]
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -58,6 +58,11 @@ jobs:
- name: Test
run: |
python -m unittest discover -v greenlet.tests
- name: Doctest
# FIXME: This conditional can go away when a Sphinx greater than 4.1.2
# is released. See https://github.com/sphinx-doc/sphinx/issues/9512
if: matrix.python-version != '3.10.0-rc.1'
run: |
sphinx-build -b doctest -d docs/_build/doctrees2 docs docs/_build/doctest2
- name: Publish package to PyPI (mac)
# We cannot 'uses: pypa/gh-action-pypi-publish@v1.4.1' because
Expand Down
5 changes: 4 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
1.1.1 (unreleased)
==================

- Nothing changed yet.
- Provide Windows binary wheels for Python 3.10 (64-bit only).

- Update Python 3.10 wheels to be built against 3.10rc1, where
applicable.


1.1.0 (2021-05-06)
Expand Down
8 changes: 7 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ environment:

matrix:
# http://www.appveyor.com/docs/installed-software#python
- PYTHON: "C:\\Python310-x64"
PYTHON_VERSION: "3.10.0rc1"
PYTHON_ARCH: "64"
PYTHON_EXE: python
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019

- PYTHON: "C:\\Python39-x64"
PYTHON_ARCH: "64"
Expand Down Expand Up @@ -161,7 +166,8 @@ build_script:

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

after_test:
- "%CMD_IN_ENV% python setup.py bdist_wheel"
Expand Down

0 comments on commit aa35d3d

Please sign in to comment.