Update PyPy3.8 to PyPy3.10 in CI

newrelic · Feb 17, 2024 · d37a2d0 · d37a2d0
1 parent 57d2236
commit d37a2d0
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 46 deletions.
diff --git a/.github/containers/Dockerfile b/.github/containers/Dockerfile
@@ -96,7 +96,7 @@ RUN echo 'eval "$(pyenv init -)"' >>${HOME}/.bashrc && \
     pyenv update
 
 # Install Python
-ARG PYTHON_VERSIONS="3.11 3.10 3.9 3.8 3.7 3.12 2.7 pypy2.7-7.3.12 pypy3.8-7.3.11"
+ARG PYTHON_VERSIONS="3.11 3.10 3.9 3.8 3.7 3.12 2.7 pypy2.7-7.3.12 pypy3.10-7.3.15 pypy3.8-7.3.11"
 COPY --chown=1000:1000 --chmod=+x ./install-python.sh /tmp/install-python.sh
 RUN /tmp/install-python.sh && \
     rm /tmp/install-python.sh

diff --git a/tox.ini b/tox.ini
@@ -16,7 +16,7 @@
 ;           framework_aiohttp-aiohttp01: aiohttp<2
 ;           framework_aiohttp-aiohttp0202: aiohttp<2.3
 ; 3. Python version required. Uses the standard tox definitions. (https://tox.readthedocs.io/en/latest/config.html#tox-environments)
-;    Examples: py27,py37,py38,py39,pypy27,pypy38
+;    Examples: py27,py37,py38,py39,pypy27,pypy310
 ; 4. Library and version (Optional). Used when testing multiple versions of the library, and may be omitted when only testing a single version.
 ;    Versions should be specified with 2 digits per version number, so <3 becomes 02 and <3.5 becomes 0304. latest and master are also acceptable versions.
 ;    Examples: uvicorn03, CherryPy0302, uvicornlatest
@@ -28,7 +28,7 @@
 ; 5. With or without New Relic C extensions (Optional). Used for testing agent features.
 ;    Examples: with_extensions, without_extensions
 ;       envlist =
-;           python-agent_features-pypy38-without_extensions,
+;           python-agent_features-pypy310-without_extensions,
 ;           python-agent_streaming-py37-{with,without}_extensions,
 ;
 ; Full Format:
@@ -45,8 +45,8 @@ setupdir = {toxinidir}
 ; Fail tests when interpreters are missing.
 skip_missing_interpreters = false
 envlist =
-    elasticsearchserver07-datastore_elasticsearch-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy38}-elasticsearch07,
-    elasticsearchserver08-datastore_elasticsearch-{py37,py38,py39,py310,py311,py312,pypy38}-elasticsearch08,
+    elasticsearchserver07-datastore_elasticsearch-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy310}-elasticsearch07,
+    elasticsearchserver08-datastore_elasticsearch-{py37,py38,py39,py310,py311,py312,pypy310}-elasticsearch08,
     firestore-datastore_firestore-{py37,py38,py39,py310,py311,py312},
     grpc-framework_grpc-{py37,py38,py39,py310,py311,py312}-grpclatest,
     grpc-framework_grpc-py27-grpc0125,
@@ -55,17 +55,17 @@ envlist =
     ; confluent-kafka had a bug in 1.8.2's setup.py file which was incompatible with 2.7.
     kafka-messagebroker_confluentkafka-{py39}-confluentkafka{0108},
     kafka-messagebroker_kafkapython-{py27,py38}-kafkapython{020001,020000},
-    kafka-messagebroker_kafkapython-{pypy27,py27,py37,py38,pypy38}-kafkapythonlatest,
+    kafka-messagebroker_kafkapython-{pypy27,py27,py37,py38,pypy310}-kafkapythonlatest,
     memcached-datastore_bmemcached-{pypy27,py27,py37,py38,py39,py310,py311,py312}-memcached030,
-    memcached-datastore_memcache-{py37,py38,py39,py310,py311,py312,pypy38}-memcached01,
+    memcached-datastore_memcache-{py37,py38,py39,py310,py311,py312,pypy310}-memcached01,
     memcached-datastore_pylibmc-{py27,py37},
-    memcached-datastore_pymemcache-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy38},
+    memcached-datastore_pymemcache-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy310},
     mongodb-datastore_pymongo-{py27,py37,py38,py39,py310,py311,py312,pypy27}-pymongo03,
-    mongodb-datastore_pymongo-{py37,py38,py39,py310,py311,py312,pypy27,pypy38}-pymongo04,
+    mongodb-datastore_pymongo-{py37,py38,py39,py310,py311,py312,pypy27,pypy310}-pymongo04,
     mssql-datastore_pymssql-{py37,py38,py39,py310,py311,py312},
     mysql-datastore_mysql-mysql080023-py27,
     mysql-datastore_mysql-mysqllatest-{py37,py38,py39,py310,py311,py312},
-    mysql-datastore_pymysql-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy38},
+    mysql-datastore_pymysql-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy310},
     postgres-datastore_asyncpg-{py37,py38,py39,py310,py311,py312},
     postgres-datastore_postgresql-{py37,py38,py39},
     postgres-datastore_psycopg2-{py27,py37,py38,py39,py310,py311,py312}-psycopg2latest,
@@ -83,82 +83,82 @@ envlist =
     python-adapter_waitress-{py37,py38,py39,py310}-waitress02,
     python-adapter_waitress-{py37,py38,py39}-waitress010404,
     python-agent_features-{py27,py37,py38,py39,py310,py311,py312}-{with,without}_extensions,
-    python-agent_features-{pypy27,pypy38}-without_extensions,
+    python-agent_features-{pypy27,pypy310}-without_extensions,
     python-agent_streaming-{py37,py38,py39,py310,py311,py312}-protobuf04-{with,without}_extensions,
     python-agent_streaming-py27-grpc0125-{with,without}_extensions,
     python-agent_streaming-py39-protobuf{03,0319}-{with,without}_extensions,
     python-agent_unittests-{py27,py37,py38,py39,py310,py311,py312}-{with,without}_extensions,
-    python-agent_unittests-{pypy27,pypy38}-without_extensions,
-    python-application_celery-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy38},
+    python-agent_unittests-{pypy27,pypy310}-without_extensions,
+    python-application_celery-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy310},
     python-component_djangorestframework-{py37,py38,py39,py310,py311,py312}-djangorestframeworklatest,
     python-component_flask_rest-py37-flaskrestx110,
-    python-component_flask_rest-{py38,py39,py310,py311,py312,pypy38}-flaskrestxlatest,
+    python-component_flask_rest-{py38,py39,py310,py311,py312,pypy310}-flaskrestxlatest,
     python-component_flask_rest-{py27,pypy27}-flaskrestx051,
     python-component_graphqlserver-{py37,py38,py39,py310,py311,py312},
-    python-component_tastypie-{py37,py38,py39,py310,py311,py312,pypy38}-tastypielatest,
-    python-coroutines_asyncio-{py37,py38,py39,py310,py311,py312,pypy38},
+    python-component_tastypie-{py37,py38,py39,py310,py311,py312,pypy310}-tastypielatest,
+    python-coroutines_asyncio-{py37,py38,py39,py310,py311,py312,pypy310},
     python-cross_agent-{py27,py37,py38,py39,py310,py311,py312}-{with,without}_extensions,
     python-cross_agent-pypy27-without_extensions,
-    python-datastore_sqlite-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy38},
+    python-datastore_sqlite-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy310},
     python-external_botocore-py311-botocore128,
     python-external_botocore-{py38,py39,py310,py311,py312}-botocorelatest,
     python-external_botocore-py310-botocore0125,
     python-external_feedparser-py27-feedparser{05,06},
     python-external_http-{py27,py37,py38,py39,py310,py311,py312,pypy27},
-    python-external_httplib-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy38},
-    python-external_httplib2-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy38},
+    python-external_httplib-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy310},
+    python-external_httplib2-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy310},
     python-external_httpx-{py37,py38,py39,py310,py311,py312},
-    python-external_requests-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy38},
-    python-external_urllib3-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy38}-urllib3latest,
+    python-external_requests-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy310},
+    python-external_urllib3-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy310}-urllib3latest,
     python-external_urllib3-{py27,py37,pypy27}-urllib3{0109},
-    python-framework_aiohttp-{py37,py38,py39,py310,py311,pypy38}-aiohttp03,
+    python-framework_aiohttp-{py37,py38,py39,py310,py311,pypy310}-aiohttp03,
     python-framework_aiohttp-py312-aiohttp030900rc0,
     python-framework_ariadne-{py37,py38,py39,py310,py311,py312}-ariadnelatest,
     python-framework_ariadne-py37-ariadne{0011,0012,0013},
-    python-framework_bottle-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy38}-bottle0012,
-    python-framework_cherrypy-{py37,py38,py39,py310,py311,py312,pypy38}-CherryPylatest,
+    python-framework_bottle-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy310}-bottle0012,
+    python-framework_cherrypy-{py37,py38,py39,py310,py311,py312,pypy310}-CherryPylatest,
     python-framework_django-{py37,py38,py39,py310,py311,py312}-Djangolatest,
     python-framework_django-{py39}-Django{0202,0300,0301,0302,0401},
-    python-framework_falcon-{py27,py37,py38,py39,pypy27,pypy38}-falcon0103,
+    python-framework_falcon-{py27,py37,py38,py39,pypy27,pypy310}-falcon0103,
     ; Falcon master branch failing on 3.11 and 3.12 currently.
     python-framework_falcon-{py311,py312}-falcon0200,
-    python-framework_falcon-{py37,py38,py39,py310,pypy38}-falcon{0200,master},
+    python-framework_falcon-{py37,py38,py39,py310,pypy310}-falcon{0200,master},
     python-framework_fastapi-{py37,py38,py39,py310,py311,py312},
     ; temporarily disabling flaskmaster tests
-    python-framework_flask-{py37,py38,py39,py310,py311,py312,pypy38}-flasklatest,
+    python-framework_flask-{py37,py38,py39,py310,py311,py312,pypy310}-flasklatest,
     python-framework_graphene-{py37,py38,py39,py310,py311,py312}-graphenelatest,
-    python-framework_graphql-{py37,py38,py39,py310,py311,py312,pypy38}-graphql03,
+    python-framework_graphql-{py37,py38,py39,py310,py311,py312,pypy310}-graphql03,
     ; temporarily disabling graphqlmaster tests
-    python-framework_graphql-{py37,py38,py39,py310,py311,py312,pypy38}-graphqllatest,
+    python-framework_graphql-{py37,py38,py39,py310,py311,py312,pypy310}-graphqllatest,
     python-framework_graphql-py37-graphql{0300,0301,0302},
-    python-framework_pyramid-{py37,py38,py39,py310,py311,py312,pypy38}-Pyramidlatest,
-    python-framework_pyramid-{py37,py38,py39,py310,py311,py312,pypy38}-Pyramid0110-cornice,
-    python-framework_sanic-{py37,py38,py39,py310,py311,py312,pypy38}-saniclatest,
-    python-framework_sanic-{py38,pypy38}-sanic{200904,210300,2109,2112,2203,2290},
-    python-framework_starlette-{py310,pypy38}-starlette{0014,0015,0019,0028},
-    python-framework_starlette-{py37,py38,py39,py310,py311,py312,pypy38}-starlettelatest,
+    python-framework_pyramid-{py37,py38,py39,py310,py311,py312,pypy310}-Pyramidlatest,
+    python-framework_pyramid-{py37,py38,py39,py310,py311,py312,pypy310}-Pyramid0110-cornice,
+    python-framework_sanic-{py37,py38,py39,py310,py311,py312,pypy310}-saniclatest,
+    python-framework_sanic-{py38,pypy310}-sanic{200904,210300,2109,2112,2203,2290},
+    python-framework_starlette-{py310,pypy310}-starlette{0014,0015,0019,0028},
+    python-framework_starlette-{py37,py38,py39,py310,py311,py312,pypy310}-starlettelatest,
     python-framework_starlette-{py37,py38}-starlette{002001},
     python-framework_strawberry-{py37,py38,py39,py310,py311,py312}-strawberrylatest,
     python-framework_tornado-{py38,py39,py310,py311,py312}-tornadolatest,
     python-framework_tornado-{py38,py39,py310,py311,py312}-tornadomaster,
-    python-logger_logging-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy38},
-    python-logger_loguru-{py37,py38,py39,py310,py311,py312,pypy38}-logurulatest,
+    python-logger_logging-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy310},
+    python-logger_loguru-{py37,py38,py39,py310,py311,py312,pypy310}-logurulatest,
     python-logger_loguru-py39-loguru{06,05},
-    python-logger_structlog-{py37,py38,py39,py310,py311,py312,pypy38}-structloglatest,
+    python-logger_structlog-{py37,py38,py39,py310,py311,py312,pypy310}-structloglatest,
     python-mlmodel_sklearn-{py37}-scikitlearn0101,
     python-mlmodel_sklearn-{py38,py39,py310,py311,py312}-scikitlearnlatest,
     python-template_genshi-{py27,py37,py38,py39,py310,py311,py312}-genshilatest,
     python-template_jinja2-{py37,py38,py39,py310,py311,py312}-jinja2latest,
     python-template_mako-{py27,py37,py38,py39,py310,py311,py312},
-    rabbitmq-messagebroker_pika-{py37,py38,py39,py310,py311,py312,pypy38}-pikalatest,
-    redis-datastore_redis-{py37,py38,py39,py310,py311,py312,pypy38}-redis{0400,latest},
-    rediscluster-datastore_rediscluster-{py37,py311,py312,pypy38}-redislatest,
-    solr-datastore_pysolr-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy38},
+    rabbitmq-messagebroker_pika-{py37,py38,py39,py310,py311,py312,pypy310}-pikalatest,
+    redis-datastore_redis-{py37,py38,py39,py310,py311,py312,pypy310}-redis{0400,latest},
+    rediscluster-datastore_rediscluster-{py37,py311,py312,pypy310}-redislatest,
+    solr-datastore_pysolr-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy310},
 
 [testenv]
 deps =
     # Base Dependencies
-    {py37,py38,py39,py310,py311,py312,pypy38}: pytest==7.2.2
+    {py37,py38,py39,py310,py311,py312,pypy310}: pytest==7.2.2
     {py27,pypy27}: pytest==4.6.11
     iniconfig
     coverage
@@ -187,10 +187,10 @@ deps =
     adapter_waitress-waitress02: waitress<2.1
     adapter_waitress-waitresslatest: waitress
     agent_features: beautifulsoup4
-    agent_features-{py37,py38,py39,py310,py311,py312,pypy38}: protobuf
+    agent_features-{py37,py38,py39,py310,py311,py312,pypy310}: protobuf
     agent_features-{py27,pypy27}: protobuf<3.18.0
     application_celery: celery<6.0
-    application_celery-{py37,pypy38}: importlib-metadata<5.0
+    application_celery-{py37,pypy310}: importlib-metadata<5.0
     mlmodel_sklearn: pandas
     mlmodel_sklearn: protobuf
     mlmodel_sklearn: numpy
@@ -270,7 +270,6 @@ deps =
     framework_bottle: markupsafe<2.1
     framework_cherrypy: routes
     framework_cherrypy: CherryPy
-    framework_cherrypy-pypy38: pydantic-core<2.15
     framework_django-Django0202: Django<2.3
     framework_django-Django0300: Django<3.1
     framework_django-Django0301: Django<3.2