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

Fixup tests for Python 3.12.0rc1 #1895

Merged
merged 2 commits into from
Aug 29, 2023
Merged

Fixup tests for Python 3.12.0rc1 #1895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5c1144
Fixup tests for Python 3.12.0rc1
basepi Aug 29, 2023
6f74bd7
Downgrade wrapt in distribution requirements.txt
basepi Aug 29, 2023
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
19 changes: 19 additions & 0 deletions .ci/.matrix_exclude.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,3 +250,22 @@ exclude:
FRAMEWORK: grpc-1.24
- VERSION: python-3.12-rc
FRAMEWORK: grpc-1.24
# py3.12
- VERSION: python-3.12-rc
FRAMEWORK: pymssql-newest # no wheels available yet
- VERSION: python-3.12-rc
FRAMEWORK: cassandra-newest # no wheels available yet
- VERSION: python-3.12-rc
FRAMEWORK: aiohttp-newest # no wheels available yet
- VERSION: python-3.12-rc
FRAMEWORK: elasticsearch-7 # relies on aiohttp
- VERSION: python-3.12-rc
FRAMEWORK: elasticsearch-8 # relies on aiohttp
- VERSION: python-3.12-rc
FRAMEWORK: aiobotocore-newest # relies on aiohttp
- VERSION: python-3.12-rc
FRAMEWORK: sanic-20.12 # no wheels available yet
- VERSION: python-3.12-rc
FRAMEWORK: sanic-newest # no wheels available yet
- VERSION: python-3.12-rc
FRAMEWORK: grpc-newest # no wheels available yet
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ test:
# delete any __pycache__ folders to avoid hard-to-debug caching issues
find . -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete
# pypy3 should be added to the first `if` once it supports py3.7
if [[ "$$PYTHON_VERSION" =~ ^(3.7|3.8|3.9|3.10|3.11|nightly)$$ ]] ; then \
if [[ "$$PYTHON_VERSION" =~ ^(3.7|3.8|3.9|3.10|3.11|3.12|nightly)$$ ]] ; then \
echo "Python 3.7+, with asyncio"; \
pytest -v $(PYTEST_ARGS) --showlocals $(PYTEST_MARKER) $(PYTEST_JUNIT); \
else \
Expand Down
2 changes: 1 addition & 1 deletion dev-utils/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# These are the pinned requirements for the lambda layer/docker image
certifi==2023.7.22
urllib3==1.26.16
wrapt==1.15.0
wrapt==1.14.1
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ zip_safe = false
install_requires =
urllib3!=2.0.0,<3.0.0
certifi
wrapt>=1.14.1
wrapt>=1.14.1,<1.15.0 # https://github.com/elastic/apm-agent-python/issues/1894
ecs_logging
test_suite=tests

Expand Down
4 changes: 2 additions & 2 deletions tests/requirements/reqs-base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pytest==7.0.1 ; python_version == '3.6'
pytest==7.3.0 ; python_version > '3.6'
pytest==7.4.0 ; python_version > '3.6'
pytest-random-order==1.1.0
pytest-django==4.4.0
coverage==6.2 ; python_version == '3.6'
Expand All @@ -25,7 +25,7 @@ mock
pytz
ecs_logging
structlog
wrapt>=1.14.1
wrapt>=1.14.1,<1.15.0

pytest-asyncio==0.21.0 ; python_version >= '3.7'
asynctest==0.13.0 ; python_version >= '3.7'
Expand Down