From e103b339fee94c7ee2e7486196304dfd4130822f Mon Sep 17 00:00:00 2001 From: irtazaakram Date: Thu, 5 Oct 2023 18:02:47 +0500 Subject: [PATCH] feat: support for django 4.2 --- .github/workflows/ci.yml | 5 +++-- requirements/base.txt | 2 +- requirements/constraints.txt | 5 +++-- requirements/devstack.txt | 2 +- requirements/local.txt | 2 +- requirements/monitoring/requirements.txt | 2 +- requirements/production.txt | 2 +- requirements/test.txt | 2 +- tox.ini | 5 +++-- 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf9c69d9..76764ba4 100644 --- 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 @@ -45,7 +46,7 @@ jobs: make static make validate_translations - name: Run Coverage - if: matrix.python-version == '3.8' && matrix.toxenv=='django32' + if: matrix.python-version == '3.8' && matrix.toxenv=='django42' uses: codecov/codecov-action@v1 with: flags: unittests diff --git a/requirements/base.txt b/requirements/base.txt index 88c65b3d..94e1410c 100644 --- 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 index 6994b426..2facec1a 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -16,8 +16,9 @@ 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 version 1.10.1 is major upgrade. +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 index a39a4b67..42d28856 100644 --- 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 index 68ac0c23..ea2fe236 100644 --- 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 index 699dd94b..06e0bf3e 100644 --- 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 index 1d1b494d..0e54f50e 100644 --- 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 index d3cc81a9..cae9f43c 100644 --- 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 index 3b51ebe2..3a48cd05 100644 --- 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,<5.0 -r{toxinidir}/requirements/test.txt whitelist_externals = i18n_tool /bin/bash -commands = {posargs:pytest} \ No newline at end of file +commands = {posargs:pytest}