fix(lib-injection): ignore attrs in min versions [backport 2.12] (#10633

) Backport 0c3f334 from #10629 to 2.12. This change removes `attrs` from the list of minimum compatible package versions, to avoid exiting lib-injection on some common ubuntu configurations. It also updates the list to reflect the current state of the repo's riot lockfiles. ## Checklist - [x] PR author has checked that all the criteria below are met - The PR description includes an overview of the change - The PR description articulates the motivation for the change - The change includes tests OR the PR description describes a testing strategy - The PR description notes risks associated with the change, if any - Newly-added code is easy to change - The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) - The change includes or references documentation updates if necessary - Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Reviewer has checked that all the criteria below are met - Title is accurate - All changes are related to the pull request's stated goal - Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - Testing strategy adequately addresses listed risks - Newly-added code is easy to change - Release note makes sense to a user of the library - If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting) Co-authored-by: Emmett Butler <[email protected]>
DataDog · Sep 11, 2024 · 81ce39e · 81ce39e
1 parent c2c3a3b
commit 81ce39e
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 34 deletions.
diff --git a/lib-injection/sources/min_compatible_versions.csv b/lib-injection/sources/min_compatible_versions.csv
@@ -14,19 +14,18 @@ aiomysql,~=0.1.0
 aiopg,~=0.16.0
 aiosqlite,0
 algoliasearch,~=2.5
-anthropic,~=0.28
+anthropic,==0.26.0
 anyio,>=3.4.0
 aredis,0
 asgiref,~=3.0.0
 astunparse,0
 async_generator,~=1.10
-asyncpg,~=0.22.0
+asyncpg,~=0.23.0
 asynctest,==0.13.0
-attrs,==22.1.0
 austin-python,~=1.0
+avro,0
 blinker,0
-boto3,0
-botocore,~=1.13
+boto3,==1.34.49
 bottle,>=0.12
 bytecode,0
 cassandra-driver,~=3.24.0
@@ -63,6 +62,7 @@ elasticsearch8,~=8.0.1
 elasticsearch[async],0
 envier,==0.5.2
 exceptiongroup,0
+faiss-cpu,==1.8.0
 falcon,~=3.0.0
 fastapi,~=0.64.0
 flask,~=0.12.0
@@ -74,7 +74,7 @@ googleapis-common-protos,0
 graphene,~=3.0.0
 graphql-core,~=3.2.0
 graphql-relay,0
-greenlet,~=1.0
+greenlet,~=1.0.0
 grpcio,~=1.34.0
 gunicorn,==20.0.4
 gunicorn[gevent],0
@@ -98,8 +98,9 @@ langchain-pinecone,==0.1.0
 langchain_experimental,==0.0.47
 logbook,~=1.0.0
 loguru,~=0.4.0
+lz4,0
 mako,~=1.1.0
-mariadb,~=1.0.0
+mariadb,~=1.0
 markupsafe,<2.0
 mock,0
 molten,>=1.0
@@ -110,44 +111,41 @@ moto[all],<5.0
 msgpack,~=1.0.0
 mysql-connector-python,==8.0.5
 mysqlclient,~=2.0
-numexpr,0
+numexpr,==2.8.5
 openai,==0.26.5
 openai[datalib],==1.30.1
-"openai[embeddings,datalib]",==0.27.2
+"openai[embeddings,datalib]",==1.1.1
 opensearch-py,0
 opensearch-py[async],0
 opensearch-py[requests],~=1.1.0
-opentelemetry-api,>=1
-opentelemetry-instrumentation-flask,<=0.37b0
+opentelemetry-api,~=1.0.0
+opentelemetry-instrumentation-flask,0
 opentracing,>=2.0.0
 peewee,0
-pillow,0
 pinecone-client,==2.2.4
 pony,0
 protobuf,>=3
 psutil,0
-psycopg,~=3.0.18
+psycopg,0
 psycopg2-binary,~=2.8.0
 py-cpuinfo,~=8.0.0
 pycryptodome,0
 pyfakefs,0
 pylibmc,~=1.6.2
 pymemcache,~=3.4.2
-pymongo,~=3.11
+pymongo,~=3.8.0
 pymysql,~=0.10
 pynamodb,~=5.0
 pyodbc,~=4.0.31
 pyramid,~=1.10
 pysqlite3-binary,0
 pytest,~=4.0
 pytest-aiohttp,0
-pytest-asyncio,~=0.21.1
 pytest-bdd,>=4.0
 pytest-benchmark,>=3.1.0
 pytest-cov,==2.9.0
 pytest-django[testing],==3.10.0
 pytest-mock,==2.0.0
-pytest-randomly,0
 pytest-sanic,~=1.6.2
 python-consul,>=1.1
 python-json-logger,==2.0.7
@@ -166,6 +164,7 @@ sanic-testing,~=0.8.3
 scikit-learn,==1.0.2
 simplejson,0
 snowflake-connector-python,~=2.3.0
+spyne,0
 sqlalchemy,~=1.2.18
 starlette,~=0.14.0
 structlog,~=20.2.0
@@ -187,3 +186,4 @@ wheel,0
 xmltodict,>=0.12
 yaaredis,~=2.0.0
 yarl,~=1.0
+zeep,0
diff --git a/min_compatible_versions.csv b/min_compatible_versions.csv
@@ -14,19 +14,18 @@ aiomysql,~=0.1.0
 aiopg,~=0.16.0
 aiosqlite,0
 algoliasearch,~=2.5
-anthropic,~=0.28
+anthropic,==0.26.0
 anyio,>=3.4.0
 aredis,0
 asgiref,~=3.0.0
 astunparse,0
 async_generator,~=1.10
-asyncpg,~=0.22.0
+asyncpg,~=0.23.0
 asynctest,==0.13.0
-attrs,==22.1.0
 austin-python,~=1.0
+avro,0
 blinker,0
-boto3,0
-botocore,~=1.13
+boto3,==1.34.49
 bottle,>=0.12
 bytecode,0
 cassandra-driver,~=3.24.0
@@ -63,6 +62,7 @@ elasticsearch8,~=8.0.1
 elasticsearch[async],0
 envier,==0.5.2
 exceptiongroup,0
+faiss-cpu,==1.8.0
 falcon,~=3.0.0
 fastapi,~=0.64.0
 flask,~=0.12.0
@@ -74,7 +74,7 @@ googleapis-common-protos,0
 graphene,~=3.0.0
 graphql-core,~=3.2.0
 graphql-relay,0
-greenlet,~=1.0
+greenlet,~=1.0.0
 grpcio,~=1.34.0
 gunicorn,==20.0.4
 gunicorn[gevent],0
@@ -98,8 +98,9 @@ langchain-pinecone,==0.1.0
 langchain_experimental,==0.0.47
 logbook,~=1.0.0
 loguru,~=0.4.0
+lz4,0
 mako,~=1.1.0
-mariadb,~=1.0.0
+mariadb,~=1.0
 markupsafe,<2.0
 mock,0
 molten,>=1.0
@@ -110,44 +111,41 @@ moto[all],<5.0
 msgpack,~=1.0.0
 mysql-connector-python,==8.0.5
 mysqlclient,~=2.0
-numexpr,0
+numexpr,==2.8.5
 openai,==0.26.5
 openai[datalib],==1.30.1
-"openai[embeddings,datalib]",==0.27.2
+"openai[embeddings,datalib]",==1.1.1
 opensearch-py,0
 opensearch-py[async],0
 opensearch-py[requests],~=1.1.0
-opentelemetry-api,>=1
-opentelemetry-instrumentation-flask,<=0.37b0
+opentelemetry-api,~=1.0.0
+opentelemetry-instrumentation-flask,0
 opentracing,>=2.0.0
 peewee,0
-pillow,0
 pinecone-client,==2.2.4
 pony,0
 protobuf,>=3
 psutil,0
-psycopg,~=3.0.18
+psycopg,0
 psycopg2-binary,~=2.8.0
 py-cpuinfo,~=8.0.0
 pycryptodome,0
 pyfakefs,0
 pylibmc,~=1.6.2
 pymemcache,~=3.4.2
-pymongo,~=3.11
+pymongo,~=3.8.0
 pymysql,~=0.10
 pynamodb,~=5.0
 pyodbc,~=4.0.31
 pyramid,~=1.10
 pysqlite3-binary,0
 pytest,~=4.0
 pytest-aiohttp,0
-pytest-asyncio,~=0.21.1
 pytest-bdd,>=4.0
 pytest-benchmark,>=3.1.0
 pytest-cov,==2.9.0
 pytest-django[testing],==3.10.0
 pytest-mock,==2.0.0
-pytest-randomly,0
 pytest-sanic,~=1.6.2
 python-consul,>=1.1
 python-json-logger,==2.0.7
@@ -166,6 +164,7 @@ sanic-testing,~=0.8.3
 scikit-learn,==1.0.2
 simplejson,0
 snowflake-connector-python,~=2.3.0
+spyne,0
 sqlalchemy,~=1.2.18
 starlette,~=0.14.0
 structlog,~=20.2.0
@@ -187,3 +186,4 @@ wheel,0
 xmltodict,>=0.12
 yaaredis,~=2.0.0
 yarl,~=1.0
+zeep,0
diff --git a/releasenotes/notes/attrs-libinject-ec10d2e8ad9ef34b.yaml b/releasenotes/notes/attrs-libinject-ec10d2e8ad9ef34b.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    library injection: Resolves an issue where the version of ``attrs`` installed by default on some Ubuntu installations
+    was treated as incompatible with library injection
diff --git a/scripts/min_compatible_versions.py b/scripts/min_compatible_versions.py
@@ -13,8 +13,8 @@
 
 
 OUT_FILENAME = "min_compatible_versions.csv"
-OUT_DIRECTORIES = (".", "lib-injection")
-IGNORED_PACKAGES = {"setuptools"}
+OUT_DIRECTORIES = (".", "lib-injection/sources")
+IGNORED_PACKAGES = {"setuptools", "attrs", "pytest-randomly", "pillow", "botocore", "pytest-asyncio"}
 
 
 def _format_version_specifiers(spec: Set[str]) -> Set[str]: