Merge branch 'main' into fix-ruff-lint

Author: mergify[bot]

.github/containers/Dockerfile

@@ -117,3 +117,8 @@ RUN mkdir -p "${PIPX_BIN_DIR}" && \
         pyenv exec pipx install --global "${line}"; \
     done </tmp/requirements-tools.txt && \
     rm /tmp/requirements-tools.txt
+
+# Inject compatibile dependencies for tox
+COPY ./requirements-tox.txt /tmp/requirements-tox.txt
+RUN pipx inject --force tox -r /tmp/requirements-tox.txt && \
+    rm /tmp/requirements-tox.txt

.github/containers/requirements-tox.txt

@@ -0,0 +1,2 @@
+virtualenv==20.26.6
+pip==24.0

.github/containers/requirements.txt

@@ -1,5 +1,5 @@
-pip
+pip==24.0
 pipx
 setuptools
-virtualenv
+virtualenv==20.26.6
 wheel

MANIFEST.in

@@ -6,7 +6,6 @@ include newrelic/version.txt
 include newrelic/newrelic.ini
 include newrelic/common/cacert.pem
 include newrelic/packages/wrapt/LICENSE
-include newrelic/packages/wrapt/README
 include newrelic/packages/urllib3/LICENSE.txt
 include newrelic/packages/isort/LICENSE
 include newrelic/packages/opentelemetry_proto/LICENSE.txt

tox.ini

@@ -48,11 +48,10 @@ envlist =
     elasticsearchserver07-datastore_elasticsearch-{py37,py38,py39,py310,py311,py312,py313,pypy310}-elasticsearch07,
     elasticsearchserver08-datastore_elasticsearch-{py37,py38,py39,py310,py311,py312,py313,pypy310}-elasticsearch08,
     firestore-datastore_firestore-{py37,py38,py39,py310,py311,py312,py313},
-    grpc-framework_grpc-{py38,py39,py310,py311,py312,py313}-grpclatest,
+    grpc-framework_grpc-{py39,py310,py311,py312,py313}-grpclatest,
     kafka-messagebroker_confluentkafka-py39-confluentkafka{0108,0107,0106},
     kafka-messagebroker_confluentkafka-{py37,py38,py39,py310,py311,py312,py313}-confluentkafkalatest,
-    kafka-messagebroker_kafkapython-py38-kafkapython{020001,020000},
-    kafka-messagebroker_kafkapython-{py37,py38,pypy310}-kafkapythonlatest,
+    kafka-messagebroker_kafkapython-{py37,py38,py39,py310,py311,py312,py313,pypy310}-kafkapythonlatest,
     kafka-messagebroker_kafkapython-{py38,py39,py310,py311,py312,py313,pypy310}-kafkapythonnglatest,
     memcached-datastore_aiomcache-{py38,py39,py310,py311,py312,py313},
     memcached-datastore_bmemcached-{py37,py38,py39,py310,py311,py312,py313},
@@ -414,9 +413,8 @@ deps =
     messagebroker_confluentkafka-confluentkafka0107: confluent-kafka<1.8
     messagebroker_confluentkafka-confluentkafka0106: confluent-kafka<1.7
     messagebroker_kafkapython-kafkapythonnglatest: kafka-python-ng
-    messagebroker_kafkapython-kafkapythonlatest: kafka-python
-    messagebroker_kafkapython-kafkapython020001: kafka-python<2.0.2
-    messagebroker_kafkapython-kafkapython020000: kafka-python<2.0.1
+    # TODO: Pinned to 2.0 for now, fix tests later
+    messagebroker_kafkapython-kafkapythonlatest: kafka-python<2.1
     template_genshi-genshilatest: genshi
     template_jinja2-jinja2latest: Jinja2
     template_jinja2-jinja2030103: Jinja2<3.1.4