Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for py310 #1734

Merged
merged 1 commit into from
Oct 6, 2021
Merged

Add support for py310 #1734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .github/workflows/tox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ jobs:
- 3.7
- 3.8
- 3.9
# NOTE: Installing ansible under 3.10-dev is currently not
# NOTE: possible because compiling cffi explodes.
- "3.10"
os:
# https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
- ubuntu-20.04
Expand All @@ -131,12 +130,18 @@ jobs:
os: ubuntu-20.04
python-version: 3.9
devel: true
- tox_env: py310
os: ubuntu-20.04
python-version: "3.10"
devel: true
skip_ansible29: true
- tox_env: py36
os: macOS-latest
python-version: 3.6
- tox_env: py38
- tox_env: py310
os: macOS-latest
python-version: 3.8
python-version: "3.10"
skip_ansible29: true

env:
TOX_PARALLEL_NO_SPINNER: 1
Expand Down Expand Up @@ -194,6 +199,7 @@ jobs:
env:
TOXENV: ${{ matrix.tox_env }}-core
- name: "Test with tox: ${{ matrix.tox_env }}-ansible29"
if: ${{ !matrix.skip_ansible29 }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit, it would probably be more robust this way:

Suggested change
if: ${{ !matrix.skip_ansible29 }}
if: >-
!toJSON(matrix.skip_ansible29)

(but it shouldn't be mandatory at this point)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not see this in GHA examples. Seems like overkill but I am curious to learn about the subject as I did find conditionals with GHA as having some unexpected behaviors at times.

run: |
python3 -m tox
env:
Expand Down
8 changes: 8 additions & 0 deletions pytest.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ filterwarnings =

# Ansible originated
ignore:The _yaml extension module is now located at yaml._yaml and its location is subject to change:DeprecationWarning:
# Ansible insides on py310:
ignore:_SixMetaPathImporter:ImportWarning
ignore:_AnsibleCollectionFinder:ImportWarning
ignore:_AnsibleCollectionRootPkgLoader:ImportWarning
ignore:_AnsibleCollectionNSPkgLoader.exec_module:ImportWarning
ignore:_AnsibleCollectionPkgLoader.exec_module:ImportWarning
ignore:_AnsiblePathHookFinder.find_spec:ImportWarning
ignore:The distutils package is deprecated and slated for removal:DeprecationWarning

# TODO: delete the following ignores once Ansible that we support gets rid of `imp`
# Ref: https://github.com/ansible-community/ansible-lint/pull/734
Expand Down
2 changes: 2 additions & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ classifiers =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: Implementation
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: Implementation :: Jython
Expand Down
1 change: 1 addition & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ minversion = 3.16.1
envlist =
lint
packaging
py310-{core,devel}
py{39,38}-{core,ansible29,devel}
py{37,36}-{core,ansible29}
isolated_build = true
Expand Down