fix: Attempting to pin DD Reqs in PIP

edx · Aug 12, 2024 · b23c19c · b23c19c
1 parent 55bd367
commit b23c19c
Show file tree

Hide file tree

Showing 8 changed files with 553 additions and 28 deletions.
diff --git a/requirements/base.in b/requirements/base.in
@@ -4,14 +4,13 @@
 # Our own rebuilt Commercetools SDK (see SONIC-30)
 commercetools @ git+https://github.com/edx/commercetools-python-sdk.git@main
 
-asgiref==3.7.2       # Until we switch to Py 3.10, this has some serius issues with debuggers.
+asgiref==3.7.2   # Until we switch to Py 3.10 this has some serius issues with debuggers.
 attrs
 celery
 celery[redis]
-currencies           # Currency Formatting
+currencies   # Currency Formatting
 python-dateutil
-datadog-checks-base
-Django>=2.2          # Web application framework
+Django>=2.2  # Web application framework
 django-cors-headers
 django-extensions
 django-rest-swagger
@@ -27,6 +26,22 @@ mysqlclient
 openedx-filters
 Pillow
 pytz
-requests-unixsocket
 segment-analytics-python
 stripe
+
+# Datadog
+datadog-checks-base
+
+# Required by datadog, their package doesnt seem to like pip? (Versions are specified by DD, but we avoid pinning...
+# so they are kept for reference)
+binary #==1.0.0
+# https://github.com/DataDog/dd-trace-py/issues/10002
+ddtrace #==2.9.3
+jellyfish #==1.1.0
+prometheus-client #==0.20.0
+protobuf #==5.27.3
+pydantic #==2.8.2
+requests-unixsocket2 #==0.4.1
+uptime #==3.0.1
+importlib-metadata==8.2.0
+
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -6,6 +6,8 @@
 #
 amqp==5.2.0
     # via kombu
+annotated-types==0.7.0
+    # via pydantic
 asgiref==3.7.2
     # via
     #   -r requirements/base.in
@@ -14,7 +16,10 @@ asgiref==3.7.2
 async-timeout==4.0.3
     # via redis
 attrs==24.2.0
-    # via -r requirements/base.in
+    # via
+    #   -r requirements/base.in
+    #   cattrs
+    #   ddtrace
 backoff==2.2.1
     # via segment-analytics-python
 backports-zoneinfo[tzdata]==0.2.1
@@ -25,6 +30,12 @@ backports-zoneinfo[tzdata]==0.2.1
     #   kombu
 billiard==4.2.0
     # via celery
+binary==1.0.0
+    # via -r requirements/base.in
+bytecode==0.15.1
+    # via ddtrace
+cattrs==23.2.3
+    # via ddtrace
 celery[redis]==5.4.0
     # via -r requirements/base.in
 certifi==2024.7.4
@@ -64,10 +75,16 @@ currencies==2020.12.12
     # via -r requirements/base.in
 datadog-checks-base==36.13.0
     # via -r requirements/base.in
+ddsketch==3.0.1
+    # via ddtrace
+ddtrace==2.10.4
+    # via -r requirements/base.in
 defusedxml==0.8.0rc2
     # via
     #   python3-openid
     #   social-auth-core
+deprecated==1.2.14
+    # via opentelemetry-api
 django==4.2.15
     # via
     #   -c requirements/common_constraints.txt
@@ -125,10 +142,18 @@ edx-opaque-keys==2.10.0
     # via edx-drf-extensions
 edx-rest-api-client==5.7.1
     # via -r requirements/base.in
+envier==0.5.2
+    # via ddtrace
+exceptiongroup==1.2.2
+    # via cattrs
 idna==3.7
     # via requests
+importlib-metadata==8.2.0
+    # via -r requirements/base.in
 itypes==1.2.0
     # via coreapi
+jellyfish==1.1.0
+    # via -r requirements/base.in
 jinja2==3.1.4
     # via coreschema
 kombu==5.4.0
@@ -155,18 +180,30 @@ openapi-codec==1.3.2
     # via django-rest-swagger
 openedx-filters==1.9.0
     # via -r requirements/base.in
+opentelemetry-api==1.16.0
+    # via ddtrace
 packaging==24.1
     # via marshmallow
 pbr==6.0.0
     # via stevedore
 pillow==10.4.0
     # via -r requirements/base.in
+prometheus-client==0.20.0
+    # via -r requirements/base.in
 prompt-toolkit==3.0.47
     # via click-repl
+protobuf==5.27.3
+    # via
+    #   -r requirements/base.in
+    #   ddtrace
 psutil==6.0.0
     # via edx-django-utils
 pycparser==2.22
     # via cffi
+pydantic==2.8.2
+    # via -r requirements/base.in
+pydantic-core==2.20.1
+    # via pydantic
 pyjwt[crypto]==2.8.0
     # via
     #   drf-jwt
@@ -202,7 +239,7 @@ requests==2.32.3
     #   edx-rest-api-client
     #   requests-mock
     #   requests-oauthlib
-    #   requests-unixsocket
+    #   requests-unixsocket2
     #   segment-analytics-python
     #   slumber
     #   social-auth-core
@@ -213,7 +250,7 @@ requests-oauthlib==2.0.0
     # via
     #   commercetools
     #   social-auth-core
-requests-unixsocket==0.3.0
+requests-unixsocket2==0.4.1
     # via -r requirements/base.in
 segment-analytics-python==2.3.2
     # via -r requirements/base.in
@@ -223,6 +260,8 @@ simplejson==3.19.2
     # via django-rest-swagger
 six==1.16.0
     # via
+    #   ddsketch
+    #   ddtrace
     #   edx-auth-backends
     #   edx-django-release-util
     #   python-dateutil
@@ -244,18 +283,28 @@ stripe==10.7.0
     # via -r requirements/base.in
 typing-extensions==4.12.2
     # via
+    #   annotated-types
     #   asgiref
+    #   bytecode
+    #   cattrs
+    #   ddtrace
     #   edx-opaque-keys
     #   kombu
+    #   pydantic
+    #   pydantic-core
     #   stripe
 tzdata==2024.1
     # via
     #   backports-zoneinfo
     #   celery
+uptime==3.0.1
+    # via -r requirements/base.in
 uritemplate==4.1.1
     # via coreapi
 urllib3==2.2.2
-    # via requests
+    # via
+    #   requests
+    #   requests-unixsocket2
 vine==5.1.0
     # via
     #   amqp
@@ -268,4 +317,13 @@ webob==1.8.7
 werkzeug==3.0.3
     # via commercetools
 wrapt==1.16.0
-    # via commercetools
+    # via
+    #   commercetools
+    #   deprecated
+xmltodict==0.13.0
+    # via ddtrace
+zipp==3.20.0
+    # via importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools