Update versions of dependencies

.github/dependabot.yml

@@ -0,0 +1,26 @@
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      dev-deps:
+        dependency-type: "development"
+      prod-deps:
+        dependency-type: "production"
+    open-pull-requests-limit: 5
+    commit-message:
+      prefix: "deps"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      actions-deps:
+        patterns:
+          - "*"
+    open-pull-requests-limit: 5
+    commit-message:
+      prefix: "ci"
+

.github/workflows/ci.yml

@@ -9,9 +9,10 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
+        python-version: ["3.9", "3.11"]
         tox_env: [python] #, precommit]
     services:
       postgres:
@@ -28,16 +29,15 @@ jobs:
         ports:
           - 5432:5432
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: "3.6.7"
+          python-version: ${{ matrix.python-version }}
       - name: Display system info
         run: python -c "import sys; print(sys.version)"
       - name: Setup Python
         run: |
-          apt-get update && apt-get install python-enchant -y
-          pip install tox
+          sudo apt-get update && sudo apt-get install python3-enchant -y
           pip install --upgrade pip
           pip install tox coveralls
       - name: Run tox

.pre-commit-config.yaml

@@ -11,53 +11,42 @@ exclude: |
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v5.0.0
     hooks:
-      - id: trailing-whitespace
-      - id: check-added-large-files
-        args: ["--maxkb=5000"]
       - id: check-ast
+      - id: check-added-large-files
+        args: ["--maxkb=2000"]
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+      - id: check-toml
+      - id: check-yaml
       - id: check-json
+      - id: name-tests-test
+        args: ["--pytest-test-first"]
+      - id: fix-byte-order-marker
+      - id: check-case-conflict
+      - id: check-docstring-first
+      - id: check-executables-have-shebangs
       - id: check-merge-conflict
       - id: check-xml
-      - id: check-yaml
-        exclude: .*/templates
       - id: debug-statements
-      - id: end-of-file-fixer
-        exclude: seed/static/seed/locales/
       - id: mixed-line-ending
-        exclude: seed/static/seed/locales/
       - id: pretty-format-json
         args: ["--autofix", "--no-sort-keys"]
-  - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v5.10.1
-    hooks:
-      - id: isort
-        args:
-          [
-            -m=VERTICAL_HANGING_INDENT,
-            --skip=seed/models/__init__.py,
-            --filter-files,
-          ]
-  - repo: https://github.com/PyCQA/autoflake
-    rev: v2.2.1
-    hooks:
-      - id: autoflake
-        args:
-          [
-            "--in-place",
-            "--recursive",
-            "--remove-all-unused-imports",
-            "--remove-unused-variable",
-          ]
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
-    hooks:
-      - id: flake8
-        args: ["--ignore=F401,E402,E501,E731,W503,W504"]
-  - repo: https://github.com/pre-commit/mirrors-prettier
+        files: \.(json|template)$
+    - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v3.0.3
     hooks:
       - id: prettier
         # for now ignoring html, javascript
         types_or: [yaml, markdown, css, scss]
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.11.7
+    hooks:
+      - id: ruff
+        args: [--fix, --exit-non-zero-on-fix, --output-format=full]
+        types_or: [python, pyi, jupyter]
+      - id: ruff-format
+        types_or: [python, pyi, jupyter]
+
+

requirements-test.txt

@@ -3,4 +3,5 @@
 autopep8==1.4.4
 coveralls==2.2.0
 coverage==5.0.1
+pre-commit==3.5.0
 tox==3.14.1

requirements.txt

@@ -2,9 +2,9 @@ Django==2.2.28
 django-bootstrap4==2.3.1
 djangorestframework==3.11.2
 djangorestframework-xml==1.0.1
-# Version of lxml has to match what is in testsuite
-lxml==4.9.1
-psycopg2==2.8.6
+
+psycopg2-binary==2.9.7
+
 semantic-version==2.10.0
 stopit==1.1.2
 xmlschema==1.0.15
@@ -14,7 +14,8 @@ xmltodict==0.12.0
 jellyfish==0.7.1
 
 # schematron runner from TestSuite repo
-testsuite==0.1.3
+# This also sets the version of lxml to use
+testsuite==0.1.5
 
 # production deployment
-uWSGI==2.0.22
+uWSGI==2.0.26

tox.ini

@@ -13,9 +13,6 @@ envlist =
 passenv=
     DJANGO_LOG_LEVEL
     DJANGO_SETTINGS_MODULE
-    TRAVIS
-    TRAVIS_JOB_ID
-    TRAVIS_BRANCH
 commands = coverage run manage.py test
 deps = -r{toxinidir}/requirements-test.txt