Merge branch 'master' into python2

furlongm · Feb 3, 2025 · 6b1d212 · 6b1d212
2 parents 15b89d0 + 7cf4d90
commit 6b1d212
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
@@ -19,7 +19,9 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
+          sudo apt update
+          sudo apt -y install libxslt-dev libxml2-dev
+          python -m pip install --upgrade pip setuptools
           pip install -r requirements.txt
       - name: Lint with flake8
         run: |
@@ -29,4 +31,6 @@ jobs:
       - name: Set secret key
         run: ./sbin/patchman-set-secret-key
       - name: Test with django
-        run: ./manage.py test
+        run: |
+          pip install legacy-cgi
+          ./manage.py test
diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@ django-extensions==3.2.1
 django-bootstrap3==23.1
 progressbar==2.5
 python-debian==0.1.49
-lxml==4.9.4
+lxml==5.2.2
 defusedxml==0.7.1
 PyYAML==6.0.1
 chardet==4.0.0