feat: add django 4.2 to ci

openedx-unsupported · Aug 28, 2023 · 619e36b · 619e36b
1 parent ee4361c
commit 619e36b
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,12 +13,13 @@ jobs:
     name: Tests
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os:
           - ubuntu-20.04
         python-version:
           - 3.8
-        toxenv: [ django32 ]
+        toxenv: [ django32, django42 ]
     steps:
     - uses: actions/checkout@v1
     - name: setup python

diff --git a/registrar/apps/api/v3/views.py b/registrar/apps/api/v3/views.py
@@ -3,7 +3,6 @@
 """
 import logging
 
-from edx_api_doc_tools import query_parameter, schema_for
 from edx_rest_framework_extensions.auth.jwt.authentication import (
     JwtAuthentication,
 )
@@ -26,18 +25,6 @@
 }
 
 
-@schema_for(
-    'get',
-    parameters=[
-        query_parameter('org_key', str, 'Organization filter'),
-        query_parameter('user_has_perm', str, 'Permission filter'),
-    ],
-    responses={
-        403: 'User lacks access to organization.',
-        404: 'Organization does not exist.',
-        **SCHEMA_COMMON_RESPONSES,
-    },
-)
 class ProgramListPaginationView(ProgramListView, TrackViewMixin, ListAPIView):
     """
     A view for listing program objects.

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -82,7 +82,7 @@ django-simple-history==3.0.0
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
-django-storages==1.8
+django-storages==1.10.1
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -16,8 +16,7 @@ Django<4.0
 # Version 3.2.0 contains bad arabic translations that will cause validation tests to fail
 django-extensions<3.2.0
 
-# django-storages version 1.9 drops support for boto storage backend.
-django-storages<1.9
+django-storages==1.10.1
 
 # From base.in
 celery<5.0  # version 5.0 drops support for python 3.5

diff --git a/requirements/devstack.txt b/requirements/devstack.txt
@@ -173,7 +173,7 @@ django-simple-history==3.0.0
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/local.txt
-django-storages==1.8
+django-storages==1.10.1
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/local.txt

diff --git a/requirements/local.txt b/requirements/local.txt
@@ -173,7 +173,7 @@ django-simple-history==3.0.0
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/test.txt
-django-storages==1.8
+django-storages==1.10.1
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/test.txt

diff --git a/requirements/monitoring/requirements.txt b/requirements/monitoring/requirements.txt
@@ -264,7 +264,7 @@ django-simple-history==3.0.0
     #   -r requirements/monitoring/../local.txt
     #   -r requirements/monitoring/../production.txt
     #   -r requirements/monitoring/../test.txt
-django-storages==1.8
+django-storages==1.10.1
     # via
     #   -r requirements/monitoring/../devstack.txt
     #   -r requirements/monitoring/../local.txt

diff --git a/requirements/production.txt b/requirements/production.txt
@@ -111,7 +111,7 @@ django-simple-history==3.0.0
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.txt
-django-storages==1.8
+django-storages==1.10.1
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.txt

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -138,7 +138,7 @@ django-simple-history==3.0.0
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.txt
-django-storages==1.8
+django-storages==1.10.1
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.txt

diff --git a/tox.ini b/tox.ini
@@ -1,13 +1,14 @@
 [tox]
-envlist = py38-django{32}
+envlist = py38-django{32, 42}
 skipsdist = true
 
 [testenv]
 passenv = *
 deps =
     django32: -r requirements/django.txt
+    django42: Django>=4.2,<4.3
     -r{toxinidir}/requirements/test.txt
 whitelist_externals =
     i18n_tool
     /bin/bash
-commands = {posargs:pytest}
+commands = {posargs:pytest}