[#233] Fix master conflicts

maykinmedia · Jan 17, 2025 · f41c29f · f41c29f
1 parent dedd953
commit f41c29f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 44 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -57,7 +57,7 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.3.0
     # via celery
-commonground-api-common==2.1.2
+commonground-api-common==2.4.1
     # via open-api-framework
 coreapi==2.3.3
     # via commonground-api-common
@@ -100,7 +100,6 @@ django==4.2.17
     #   drf-nested-routers
     #   drf-spectacular
     #   drf-spectacular-sidecar
-    #   drf-yasg
     #   maykin-2fa
     #   mozilla-django-oidc
     #   mozilla-django-oidc-db
@@ -172,7 +171,6 @@ djangorestframework==3.15.2
     #   djangorestframework-inclusions
     #   drf-nested-routers
     #   drf-spectacular
-    #   drf-yasg
     #   notifications-api-common
     #   open-api-framework
 djangorestframework-camel-case==1.4.2
@@ -186,11 +184,11 @@ djangorestframework-inclusions==1.2.0
 drf-nested-routers==0.94.1
     # via commonground-api-common
 drf-spectacular==0.27.2
-    # via open-api-framework
+    # via
+    #   commonground-api-common
+    #   open-api-framework
 drf-spectacular-sidecar==2024.7.1
     # via drf-spectacular
-drf-yasg==1.21.7
-    # via commonground-api-common
 ecs-logging==2.2.0
     # via elastic-apm
 elastic-apm==6.23.0
@@ -208,9 +206,7 @@ humanize==4.10.0
 idna==3.7
     # via requests
 inflection==0.5.1
-    # via
-    #   drf-spectacular
-    #   drf-yasg
+    # via drf-spectacular
 iso-639==0.4.5
     # via commonground-api-common
 isodate==0.6.1
@@ -245,8 +241,6 @@ orderedmultidict==1.0.1
     # via furl
 oyaml==1.0
     # via commonground-api-common
-packaging==24.1
-    # via drf-yasg
 phonenumberslite==8.13.42
     # via django-two-factor-auth
 prometheus-client==0.20.0
@@ -286,13 +280,10 @@ python-dotenv==1.0.1
     #   open-api-framework
     #   pydantic-settings
 pytz==2024.1
-    # via
-    #   drf-yasg
-    #   flower
+    # via flower
 pyyaml==6.0.1
     # via
     #   drf-spectacular
-    #   drf-yasg
     #   oyaml
     #   pydantic-settings
 qrcode==7.4.2
@@ -345,7 +336,6 @@ uritemplate==4.1.1
     # via
     #   coreapi
     #   drf-spectacular
-    #   drf-yasg
 urllib3==2.2.2
     # via
     #   elastic-apm

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -117,7 +117,7 @@ click-repl==0.3.0
     #   celery
 codecov==2.1.13
     # via -r requirements/test-tools.in
-commonground-api-common==2.1.2
+commonground-api-common==2.4.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -181,7 +181,6 @@ django==4.2.17
     #   drf-nested-routers
     #   drf-spectacular
     #   drf-spectacular-sidecar
-    #   drf-yasg
     #   maykin-2fa
     #   mozilla-django-oidc
     #   mozilla-django-oidc-db
@@ -320,7 +319,6 @@ djangorestframework==3.15.2
     #   djangorestframework-inclusions
     #   drf-nested-routers
     #   drf-spectacular
-    #   drf-yasg
     #   notifications-api-common
     #   open-api-framework
 djangorestframework-camel-case==1.4.2
@@ -354,17 +352,13 @@ drf-spectacular==0.27.2
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   commonground-api-common
     #   open-api-framework
 drf-spectacular-sidecar==2024.7.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   drf-spectacular
-drf-yasg==1.21.7
-    # via
-    #   -c requirements/base.txt
-    #   -r requirements/base.txt
-    #   commonground-api-common
 ecs-logging==2.2.0
     # via
     #   -c requirements/base.txt
@@ -421,7 +415,6 @@ inflection==0.5.1
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   drf-spectacular
-    #   drf-yasg
 iniconfig==2.0.0
     # via pytest
 iso-639==0.4.5
@@ -522,10 +515,7 @@ oyaml==1.0
     #   commonground-api-common
 packaging==24.1
     # via
-    #   -c requirements/base.txt
-    #   -r requirements/base.txt
     #   black
-    #   drf-yasg
     #   pytest
     #   sphinx
 pathspec==0.12.1
@@ -633,14 +623,12 @@ pytz==2024.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-    #   drf-yasg
     #   flower
 pyyaml==6.0.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   drf-spectacular
-    #   drf-yasg
     #   oyaml
     #   pydantic-settings
     #   vcrpy
@@ -768,7 +756,6 @@ uritemplate==4.1.1
     #   -r requirements/base.txt
     #   coreapi
     #   drf-spectacular
-    #   drf-yasg
 urllib3==2.2.2
     # via
     #   -c requirements/base.txt

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -138,7 +138,7 @@ codecov==2.1.13
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-commonground-api-common==2.1.2
+commonground-api-common==2.4.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -216,7 +216,6 @@ django==4.2.17
     #   drf-nested-routers
     #   drf-spectacular
     #   drf-spectacular-sidecar
-    #   drf-yasg
     #   maykin-2fa
     #   mozilla-django-oidc
     #   mozilla-django-oidc-db
@@ -361,7 +360,6 @@ djangorestframework==3.15.2
     #   djangorestframework-inclusions
     #   drf-nested-routers
     #   drf-spectacular
-    #   drf-yasg
     #   notifications-api-common
     #   open-api-framework
 djangorestframework-camel-case==1.4.2
@@ -397,17 +395,13 @@ drf-spectacular==0.27.2
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   commonground-api-common
     #   open-api-framework
 drf-spectacular-sidecar==2024.7.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   drf-spectacular
-drf-yasg==1.21.7
-    # via
-    #   -c requirements/ci.txt
-    #   -r requirements/ci.txt
-    #   commonground-api-common
 ecs-logging==2.2.0
     # via
     #   -c requirements/ci.txt
@@ -480,7 +474,6 @@ inflection==0.5.1
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   drf-spectacular
-    #   drf-yasg
 iniconfig==2.0.0
     # via
     #   -c requirements/ci.txt
@@ -603,7 +596,6 @@ packaging==24.1
     #   -r requirements/ci.txt
     #   black
     #   build
-    #   drf-yasg
     #   pytest
     #   sphinx
 pathspec==0.12.1
@@ -743,14 +735,12 @@ pytz==2024.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-    #   drf-yasg
     #   flower
 pyyaml==6.0.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   drf-spectacular
-    #   drf-yasg
     #   oyaml
     #   pydantic-settings
     #   vcrpy
@@ -923,7 +913,6 @@ uritemplate==4.1.1
     #   -r requirements/ci.txt
     #   coreapi
     #   drf-spectacular
-    #   drf-yasg
 urllib3==2.2.2
     # via
     #   -c requirements/ci.txt