Merge branch 'main' into fix-zizmor

hugovk · Dec 8, 2024 · 816fa89 · 816fa89
2 parents a36c338 + 350feb1
commit 816fa89
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.azure-pipelines/jobs/test.yml b/.azure-pipelines/jobs/test.yml
@@ -30,6 +30,7 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install  -e ".[numpy,pandas,tests]"
           python -m pip install --upgrade pytest-azurepipelines
+          python -m pip install "httpx==0.27.2"
         displayName: "Install dependencies"
 
       - script: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,12 +28,14 @@ jobs:
       - name: Install uv
         uses: hynek/setup-cached-uv@v2
 
-      - name: Tox tests
-        run: |
-          uvx --with tox-uv tox -e py
+      # Temporarily pin HTTPX pending RESPX compatibility
+      # - name: Tox tests
+      #  run: |
+      #    uvx --with tox-uv tox -e py
 
       - name: Tox tests (pins)
-        if: matrix.python-version == '3.11' && matrix.os == 'ubuntu-latest'
+        # Temporarily pin HTTPX pending RESPX compatibility
+        # if: matrix.python-version == '3.11' && matrix.os == 'ubuntu-latest'
         run: |
           uvx --with tox-uv tox -e pins
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,12 +1,13 @@
 # Only for testing pinned versions on the CI
 freezegun==1.5.1
-httpx==0.27.2
-numpy==2.1.2
+httpx==0.27.2  # Temporarily pin HTTPX pending RESPX compatibility
+numpy==2.1.3; python_version >= "3.10"
+numpy; python_version <= "3.9"
 pandas==2.2.3
 platformdirs==4.3.6
 prettytable==3.12.0
 pytablewriter[html]==1.2.0
-pytest==8.3.3
+pytest==8.3.4
 pytest-cov==6.0.0
 python-slugify==8.0.4
 respx==0.21.1