fix failing tests

Author: emmettbutler

.riot/requirements/118fd10.txt renamed to .riot/requirements/1072660.txt

@@ -2,13 +2,13 @@
 # This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/118fd10.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/1072660.in
 #
-asgiref==3.9.1
-attrs==25.3.0
+asgiref==3.10.0
+attrs==25.4.0
 bcrypt==4.2.1
-certifi==2025.8.3
-charset-normalizer==3.4.3
+certifi==2025.10.5
+charset-normalizer==3.4.4
 coverage[toml]==7.10.7
 dill==0.4.0
 django==4.0.10
@@ -18,8 +18,9 @@ gevent==25.9.1
 greenlet==3.2.4
 gunicorn==23.0.0
 hypothesis==6.45.0
-idna==3.10
+idna==3.11
 iniconfig==2.1.0
+legacy-cgi==2.6.4
 mock==5.2.0
 opentracing==2.4.0
 packaging==25.0
@@ -30,16 +31,16 @@ pytest==8.4.2
 pytest-cov==7.0.0
 pytest-django[testing]==3.10.0
 pytest-mock==3.15.1
-pyyaml==6.0.2
+pyyaml==6.0.3
 requests==2.32.5
 six==1.17.0
 sortedcontainers==2.4.0
 sqlparse==0.5.3
-tomli==2.2.1
+tomli==2.3.0
 typing-extensions==4.15.0
 urllib3==2.5.0
 zope-event==6.0
-zope-interface==8.0
+zope-interface==8.0.1
 
 # The following packages are considered to be unsafe in a requirements file:
 setuptools==80.9.0

.riot/requirements/1b4f196.txt

@@ -2,24 +2,16 @@
 # This file is autogenerated by pip-compile with Python 3.13
 # by the following command:
 #
-<<<<<<<< HEAD:.riot/requirements/1b4f196.txt
 #    pip-compile --allow-unsafe --no-annotate .riot/requirements/1b4f196.in
-========
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/1532cbc.in
->>>>>>>> main:.riot/requirements/1532cbc.txt
 #
 asgiref==3.10.0
 attrs==25.4.0
 bcrypt==4.2.1
 certifi==2025.10.5
 charset-normalizer==3.4.4
-coverage[toml]==7.11.0
+coverage[toml]==7.11.1
 dill==0.4.0
-<<<<<<<< HEAD:.riot/requirements/1b4f196.txt
 django==5.2.8
-========
-django==4.2.26
->>>>>>>> main:.riot/requirements/1532cbc.txt
 django-configurations==2.5.1
 gevent==25.9.1
 greenlet==3.2.4
@@ -44,8 +36,5 @@ six==1.17.0
 sortedcontainers==2.4.0
 sqlparse==0.5.3
 urllib3==2.5.0
-zope-event==6.0
+zope-event==6.1
 zope-interface==8.0.1
-
-# The following packages are considered to be unsafe in a requirements file:
-setuptools==80.9.0

.riot/requirements/13632f0.txt renamed to .riot/requirements/6c3e5ec.txt

@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile with Python 3.13
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/13632f0.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/6c3e5ec.in
 #
 asgiref==3.10.0
 attrs==25.4.0
@@ -19,6 +19,7 @@ gunicorn==23.0.0
 hypothesis==6.45.0
 idna==3.11
 iniconfig==2.3.0
+legacy-cgi==2.6.4
 mock==5.2.0
 opentracing==2.4.0
 packaging==25.0

.riot/requirements/c48b250.txt renamed to .riot/requirements/6c76bd7.txt

@@ -2,23 +2,24 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/c48b250.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/6c76bd7.in
 #
-asgiref==3.9.1
-attrs==25.3.0
+asgiref==3.10.0
+attrs==25.4.0
 bcrypt==4.2.1
-certifi==2025.8.3
-charset-normalizer==3.4.3
-coverage[toml]==7.10.7
+certifi==2025.10.5
+charset-normalizer==3.4.4
+coverage[toml]==7.11.1
 dill==0.4.0
 django==4.0.10
 django-configurations==2.5.1
 gevent==25.9.1
 greenlet==3.2.4
 gunicorn==23.0.0
 hypothesis==6.45.0
-idna==3.10
-iniconfig==2.1.0
+idna==3.11
+iniconfig==2.3.0
+legacy-cgi==2.6.4
 mock==5.2.0
 opentracing==2.4.0
 packaging==25.0
@@ -29,14 +30,11 @@ pytest==8.4.2
 pytest-cov==7.0.0
 pytest-django[testing]==3.10.0
 pytest-mock==3.15.1
-pyyaml==6.0.2
+pyyaml==6.0.3
 requests==2.32.5
 six==1.17.0
 sortedcontainers==2.4.0
 sqlparse==0.5.3
 urllib3==2.5.0
-zope-event==6.0
-zope-interface==8.0
-
-# The following packages are considered to be unsafe in a requirements file:
-setuptools==80.9.0
+zope-event==6.1
+zope-interface==8.0.1

.riot/requirements/bebf559.txt

@@ -2,14 +2,14 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/199a155.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/e712306.in
 #
-asgiref==3.9.1
-attrs==25.3.0
+asgiref==3.10.0
+attrs==25.4.0
 bcrypt==4.2.1
-certifi==2025.8.3
-charset-normalizer==3.4.3
-coverage[toml]==7.10.7
+certifi==2025.10.5
+charset-normalizer==3.4.4
+coverage[toml]==7.11.1
 dill==0.4.0
 django==4.0.10
 django-configurations==2.5.1
@@ -18,8 +18,9 @@ gevent==25.9.1
 greenlet==3.2.4
 gunicorn==23.0.0
 hypothesis==6.45.0
-idna==3.10
-iniconfig==2.1.0
+idna==3.11
+iniconfig==2.3.0
+legacy-cgi==2.6.4
 mock==5.2.0
 opentracing==2.4.0
 packaging==25.0
@@ -30,16 +31,13 @@ pytest==8.4.2
 pytest-cov==7.0.0
 pytest-django[testing]==3.10.0
 pytest-mock==3.15.1
-pyyaml==6.0.2
+pyyaml==6.0.3
 requests==2.32.5
 six==1.17.0
 sortedcontainers==2.4.0
 sqlparse==0.5.3
-tomli==2.2.1
+tomli==2.3.0
 typing-extensions==4.15.0
 urllib3==2.5.0
-zope-event==6.0
-zope-interface==8.0
-
-# The following packages are considered to be unsafe in a requirements file:
-setuptools==80.9.0
+zope-event==6.1
+zope-interface==8.0.1

.riot/requirements/199a155.txt renamed to .riot/requirements/e712306.txt

@@ -271,7 +271,7 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
                 ),
                 Venv(
                     pys=["3.9", "3.10", "3.11", "3.12", "3.13"],
-                    pkgs={"django": "==4.0.10"},
+                    pkgs={"django": "==4.0.10", "legacy-cgi": latest},
                 ),
                 Venv(
                     pys=["3.13"],

riotfile.py

@@ -30,7 +30,7 @@
 def test_fork_handler_callable(iast_context_defaults):
     """Verify that _reset_iast_after_fork is callable and disables IAST."""
     from ddtrace.appsec._iast import _disable_iast_after_fork
-    from ddtrace.settings.asm import config as asm_config
+    from ddtrace.internal.settings.asm import config as asm_config
 
     # Should not raise any exception
     try:
@@ -48,7 +48,7 @@ def test_fork_handler_with_active_context(iast_context_defaults):
     """Verify fork handler disables IAST and clears context when active."""
     from ddtrace.appsec._iast import _disable_iast_after_fork
     from ddtrace.appsec._iast._taint_tracking import is_tainted
-    from ddtrace.settings.asm import config as asm_config
+    from ddtrace.internal.settings.asm import config as asm_config
 
     _start_iast_context_and_oce()
 
@@ -83,7 +83,7 @@ def child_process_work(queue):
         """Child process where IAST should be disabled."""
         try:
             from ddtrace.appsec._iast._taint_tracking import is_tainted
-            from ddtrace.settings.asm import config as asm_config
+            from ddtrace.internal.settings.asm import config as asm_config
 
             # Start IAST in child (will be a no-op since IAST is disabled)
             _start_iast_context_and_oce()
@@ -139,7 +139,7 @@ def test_multiple_fork_operations(iast_context_defaults):
     def simple_child_work(queue, child_id):
         """Simple child process work - IAST will be disabled."""
         try:
-            from ddtrace.settings.asm import config as asm_config
+            from ddtrace.internal.settings.asm import config as asm_config
 
             # These should be safe no-ops since IAST is disabled
             _start_iast_context_and_oce()
@@ -196,7 +196,7 @@ def test_fork_with_os_fork_no_segfault(iast_context_defaults):
     if pid == 0:
         # Child process - IAST should be disabled
         try:
-            from ddtrace.settings.asm import config as asm_config
+            from ddtrace.internal.settings.asm import config as asm_config
 
             # IAST should be disabled after fork
             if asm_config._iast_enabled:
@@ -237,7 +237,7 @@ def test_fork_handler_clears_state(iast_context_defaults):
     """
     from ddtrace.appsec._iast import _disable_iast_after_fork
     from ddtrace.appsec._iast._taint_tracking import is_tainted
-    from ddtrace.settings.asm import config as asm_config
+    from ddtrace.internal.settings.asm import config as asm_config
 
     _start_iast_context_and_oce()
     tainted = taint_pyobject("test", "source", "value", OriginType.PARAMETER)
@@ -278,7 +278,7 @@ def child_eval_work(queue):
         """Child process with IAST disabled."""
         try:
             from ddtrace.appsec._iast._taint_tracking import is_tainted
-            from ddtrace.settings.asm import config as asm_config
+            from ddtrace.internal.settings.asm import config as asm_config
 
             # IAST should be disabled, so this is a no-op
             _start_iast_context_and_oce()
@@ -325,7 +325,7 @@ def test_early_fork_keeps_iast_enabled():
     """
     from ddtrace.appsec._iast import _disable_iast_after_fork
     from ddtrace.appsec._iast._taint_tracking import is_tainted
-    from ddtrace.settings.asm import config as asm_config
+    from ddtrace.internal.settings.asm import config as asm_config
 
     # Ensure IAST is enabled but NO context is active (simulating early fork)
     # Don't call _start_iast_context_and_oce() - this simulates pre-fork state