From 66cb1388a57c4011208d20472fd0f2ebf2132643 Mon Sep 17 00:00:00 2001
From: Irtaza Akram <irtaza.akram@arbisoft.com>
Date: Fri, 6 Sep 2024 10:33:02 +0500
Subject: [PATCH] fix: move to ubuntu-latest

---
 .github/workflows/ci.yml           | 4 ++--
 .github/workflows/pypi-publish.yml | 2 +-
 .readthedocs.yaml                  | 2 +-
 requirements/constraints.txt       | 3 +++
 requirements/dev.txt               | 2 +-
 requirements/django-test.txt       | 4 ++--
 requirements/doc.txt               | 2 +-
 requirements/pip.txt               | 2 +-
 requirements/test.txt              | 2 +-
 tox.ini                            | 2 +-
 10 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e8a8881b..2f5d8f6c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest]
         python-version: ['3.11', '3.12']
         toxenv: [quality, docs, without-django, django42]
 
@@ -36,7 +36,7 @@ jobs:
       run: tox -- --hypothesis-profile=ci
 
     - name: Run Coverage
-      if: matrix.python-version == '3.11' && matrix.toxenv=='django42'
+      if: matrix.python-version == '3.11' && matrix.toxenv == 'django42'
       uses: codecov/codecov-action@v4
       with:
         flags: unittests
diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml
index 60e5a189..42c80d89 100644
--- a/.github/workflows/pypi-publish.yml
+++ b/.github/workflows/pypi-publish.yml
@@ -7,7 +7,7 @@ on:
 jobs:
 
   push:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 3d3418cf..9b104a51 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -7,7 +7,7 @@ version: 2
 
 # Set the OS, Python version and other tools you might need
 build:
-   os: ubuntu-22.04
+   os: ubuntu-lts-latest
    tools:
       python: "3.11"
 
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 94595ab1..8f8ed189 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -7,3 +7,6 @@
 # link to other information that will help people in the future to remove the
 # pin when possible.  Writing an issue against the offending project and
 # linking to it here is good.
+
+# Common constraints for edx repos
+-c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 22332096..dbaee887 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -106,7 +106,7 @@ filelock==3.15.4
     #   -r requirements/ci.txt
     #   tox
     #   virtualenv
-hypothesis==6.111.2
+hypothesis==6.112.0
     # via -r requirements/doc.txt
 idna==3.8
     # via
diff --git a/requirements/django-test.txt b/requirements/django-test.txt
index b8b6e521..ebf8837b 100644
--- a/requirements/django-test.txt
+++ b/requirements/django-test.txt
@@ -47,7 +47,7 @@ execnet==2.1.1
     # via
     #   -r requirements/test.txt
     #   pytest-xdist
-hypothesis==6.111.2
+hypothesis==6.112.0
     # via -r requirements/test.txt
 iniconfig==2.0.0
     # via
@@ -125,7 +125,7 @@ pytest==8.3.2
     #   pytest-xdist
 pytest-cov==5.0.0
     # via -r requirements/test.txt
-pytest-django==4.8.0
+pytest-django==4.9.0
     # via -r requirements/django-test.in
 pytest-xdist==3.6.1
     # via -r requirements/test.txt
diff --git a/requirements/doc.txt b/requirements/doc.txt
index c2805009..9486622f 100644
--- a/requirements/doc.txt
+++ b/requirements/doc.txt
@@ -66,7 +66,7 @@ execnet==2.1.1
     # via
     #   -r requirements/test.txt
     #   pytest-xdist
-hypothesis==6.111.2
+hypothesis==6.112.0
     # via -r requirements/test.txt
 idna==3.8
     # via requests
diff --git a/requirements/pip.txt b/requirements/pip.txt
index 92563d4f..f313a9c2 100644
--- a/requirements/pip.txt
+++ b/requirements/pip.txt
@@ -10,5 +10,5 @@ wheel==0.44.0
 # The following packages are considered to be unsafe in a requirements file:
 pip==24.2
     # via -r requirements/pip.in
-setuptools==74.0.0
+setuptools==74.1.2
     # via -r requirements/pip.in
diff --git a/requirements/test.txt b/requirements/test.txt
index c2213654..9a735872 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -35,7 +35,7 @@ edx-lint==5.4.0
     # via -r requirements/test.in
 execnet==2.1.1
     # via pytest-xdist
-hypothesis==6.111.2
+hypothesis==6.112.0
     # via -r requirements/test.in
 iniconfig==2.0.0
     # via pytest
diff --git a/tox.ini b/tox.ini
index 80e8df17..8c1bde2f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ skip_missing_interpreters = True
 
 [testenv]
 deps =
-    django42: Django>=4.2,<4.3
+    django42: Django>=4.2,<5.0
     -r{toxinidir}/requirements/django-test.txt
 commands = pytest -v --disable-pytest-warnings --nomigrations {posargs}