ci: run tests for legacy versions

Author: KowalskiThomas

.github/workflows/test.yml

@@ -53,9 +53,6 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04]
-        # In the future, we need to add support for Python 2.7 and 3.4, as we officially
-        # support those versions. However, support for those versions has been removed from
-        # setup-python so we will need to find a workaround.
         python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14', 'pypy2.7', 'pypy3.8']
         # os: [ubuntu-latest, windows-latest, macos-latest]
         # python-version: ['2.7', '3.7', '3.8', '3.9', '3.10', 'pypy-2.7', 'pypy-3.8']
@@ -95,3 +92,68 @@ jobs:
 
     - name: Run admin integration tests on cassettes
       run: tox -e integration-admin -- --vcr-record=none
+
+  run-legacy:
+    # actions/setup-python dropped support for Python 2.7 and 3.4, so we use
+    # official Python Docker images instead to test those EOL-but-supported versions.
+    name: Python ${{ matrix.python-version }} (legacy) on Linux
+    runs-on: ubuntu-latest
+    container:
+      image: python:${{ matrix.python-version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ['2.7', '3.4']
+    steps:
+    # All actions/checkout versions now use Node.js >= 20 (glibc >= 2.25).
+    # python:3.4 is Debian Stretch (glibc 2.24) so Node.js can't run there.
+    # Use a plain git clone instead — no Node.js needed.
+    - name: Checkout
+      run: |
+        git init .
+        git remote add origin https://github.com/${{ github.repository }}
+        git fetch --depth 1 origin ${{ github.sha }}
+        git checkout FETCH_HEAD
+
+    - name: Set constraints for python2.7
+      # Latest PyYaml supported version for python 2.7 is 5.4.1 which requires
+      # cython<3 to build. See: https://github.com/yaml/pyyaml/issues/724
+      if: ${{ matrix.python-version == '2.7' }}
+      run: |
+        echo "cython<3" > /tmp/constraints.txt
+        echo "PIP_CONSTRAINT=/tmp/constraints.txt" >> $GITHUB_ENV
+
+    - name: Set constraints for python3.4
+      # PyYAML 5.3+ dropped Python 3.4 support; vcrpy pulls it in.
+      if: ${{ matrix.python-version == '3.4' }}
+      run: |
+        echo "PyYAML<5.3" > /tmp/constraints.txt
+        echo "PIP_CONSTRAINT=/tmp/constraints.txt" >> $GITHUB_ENV
+
+    - name: Set TOXENV
+      # Use tr instead of ${//} because the container runs sh, not bash.
+      run: |
+        version="${{ matrix.python-version }}"
+        echo "TOXENV=py$(echo "$version" | tr -d '.')" >> $GITHUB_ENV
+
+    - name: Install tox
+      # tox 4+ requires Python 3.7+; virtualenv 20.22+ dropped Python 2.7 support.
+      run: pip install 'tox<4' 'virtualenv<20.22'
+
+    - name: Run unit tests
+      # Disable origin detection: the job runs inside a Docker container, so
+      # the client would detect the container ID and append |c:<id> to every
+      # metric, which the tests don't expect.
+      env:
+        DD_ORIGIN_DETECTION_ENABLED: "false"
+      run: tox
+
+    - name: Run integration tests on cassettes
+      env:
+        DD_ORIGIN_DETECTION_ENABLED: "false"
+      run: tox -e integration -- --vcr-record=none
+
+    - name: Run admin integration tests on cassettes
+      env:
+        DD_ORIGIN_DETECTION_ENABLED: "false"
+      run: tox -e integration-admin -- --vcr-record=none

datadog/dogshell/wrap.py

@@ -413,7 +413,7 @@ def parse_options(raw_args=None):
     if is_p3k():
         cmd = " ".join(args)
     else:
-        cmd = b" ".join(a.encode("utf-8") for a in args).decode("utf-8")
+        cmd = b" ".join(a if isinstance(a, bytes) else a.encode("utf-8") for a in args).decode("utf-8")
 
     return options, cmd
 

tests/integration/dogshell/test_dogshell.py

@@ -750,7 +750,7 @@ def test_security_monitoring_rules(self, dogshell, get_unique, tmp_path):
             "type": "log_detection"
         }
 
-        with open(rule_file, "w") as f:
+        with open(str(rule_file), "w") as f:
             json.dump(rule_data, f)
 
         # Create rule
@@ -772,7 +772,7 @@ def test_security_monitoring_rules(self, dogshell, get_unique, tmp_path):
         updated_name = "Updated Rule {}".format(unique)
         rule_data["name"] = updated_name
 
-        with open(rule_file, "w") as f:
+        with open(str(rule_file), "w") as f:
             json.dump(rule_data, f)
 
         out, _, _ = dogshell(["security-monitoring", "rules", "update", rule_id, "--file", str(rule_file)])

tests/unit/dogstatsd/test_max_sample_metrics.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import threading
 import unittest
 from mock import patch

tox.ini

@@ -9,7 +9,9 @@ envlist =
     # black - see comments below
 
 [testenv]
-passenv = DD_TEST_CLIENT*
+passenv =
+    DD_TEST_CLIENT*
+    DD_ORIGIN_DETECTION_ENABLED
 usedevelop = true
 deps =
     click
@@ -23,24 +25,43 @@ commands =
     !integration: pytest -v tests/unit {posargs}
     integration: pytest -v tests/integration -m "not admin_needed" {posargs}
 
+[testenv:integration]
+# Use skip_install + PYTHONPATH so this env works on Python 3.4 too
+# (hatchling can't be built there).  requests must be listed explicitly
+# since it is a runtime dep normally pulled in by the package install.
+skip_install = true
+setenv = PYTHONPATH = {toxinidir}
+deps =
+    {[testenv]deps}
+    requests>=2.6.0
+    typing
+
 [testenv:integration-admin]
-passenv = DD_TEST_CLIENT*
-usedevelop = true
+skip_install = true
+setenv = PYTHONPATH = {toxinidir}
 deps =
-    click
-    freezegun
-    mock
-    pytest
-    pytest-vcr
-    python-dateutil
-    vcrpy
+    {[testenv]deps}
+    requests>=2.6.0
+    typing
 commands =
     pytest -v tests/integration -m "admin_needed" {posargs}
 
+[testenv:py34]
+# hatchling (the build backend in pyproject.toml) cannot be installed on
+# Python 3.4 because it transitively requires pluggy>=1.0.0 which has no
+# Python-3.4-compatible release.  Skip the package install and expose the
+# source via PYTHONPATH instead, adding the runtime deps explicitly.
+skip_install = true
+setenv = PYTHONPATH = {toxinidir}
+deps =
+    {[testenv]deps}
+    requests>=2.6.0
+    typing
+
 [testenv:flake8]
 skip_install = true
 deps =
-    flake8==3.7.9
+    flake8==7.1.2
 commands = flake8 datadog
 
 # Black isn't safe to run while support is being maintained for python2.7, but 
@@ -61,7 +82,10 @@ commands =
 
 [flake8]
 max-line-length = 120
-ignore = E203,W503
+# E203, W503: formatting disagreements with black
+# F401: pyflakes 3.x no longer tracks # type: comment usages, producing false
+#        positives for all typing imports used only in PEP 484 type comments.
+ignore = E203,W503,F401
 
 [pytest]
 markers =