diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65284b6..f3a2a2e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,9 +14,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04] - python-version: ['3.8'] - toxenv: [quality, django32, django42] + os: [ubuntu-latest] + python-version: ['3.11', '3.12'] + toxenv: [quality, django42] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index a47eb5a..da49912 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -8,7 +8,7 @@ on: jobs: push: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout @@ -16,7 +16,7 @@ jobs: - name: setup python uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.12 - name: Install pip run: pip install -r requirements/pip.txt diff --git a/lang_pref_middleware/__init__.py b/lang_pref_middleware/__init__.py index 7beaf4d..b122e3e 100644 --- a/lang_pref_middleware/__init__.py +++ b/lang_pref_middleware/__init__.py @@ -1,3 +1,3 @@ """Init module for lang_pref_middleware.""" -__version__ = '1.3.0' +__version__ = '2.0.0' diff --git a/pylintrc b/pylintrc index cadb490..e9f59d6 100644 --- a/pylintrc +++ b/pylintrc @@ -64,7 +64,7 @@ # SERIOUSLY. # # ------------------------------ -# Generated by edx-lint version: 5.2.5 +# Generated by edx-lint version: 5.4.0 # ------------------------------ [MASTER] ignore = @@ -259,6 +259,7 @@ enable = useless-suppression, disable = bad-indentation, + broad-exception-raised, consider-using-f-string, duplicate-code, file-ignored, @@ -380,6 +381,6 @@ ext-import-graph = int-import-graph = [EXCEPTIONS] -overgeneral-exceptions = Exception +overgeneral-exceptions = builtins.Exception -# 54daa2b24c4b5341a45cdb4727fe15d05ef04c5f +# 821f7cf64aaeddd33ba92fc983426e975d2eac72 diff --git a/requirements/base.txt b/requirements/base.txt index 23baafc..f0ac5d2 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,7 +6,7 @@ # asgiref==3.8.1 # via django -django==4.2.15 +django==4.2.16 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in diff --git a/requirements/ci.txt b/requirements/ci.txt index f5468ae..f119430 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,7 +4,7 @@ # # make upgrade # -cachetools==5.4.0 +cachetools==5.5.0 # via tox chardet==5.2.0 # via tox @@ -12,7 +12,7 @@ colorama==0.4.6 # via tox distlib==0.3.8 # via virtualenv -filelock==3.15.4 +filelock==3.16.0 # via # tox # virtualenv @@ -20,7 +20,7 @@ packaging==24.1 # via # pyproject-api # tox -platformdirs==4.2.2 +platformdirs==4.3.2 # via # tox # virtualenv @@ -28,7 +28,7 @@ pluggy==1.5.0 # via tox pyproject-api==1.7.1 # via tox -tox==4.17.1 +tox==4.18.1 # via -r requirements/ci.in -virtualenv==20.26.3 +virtualenv==20.26.4 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index b3e62ed..4328c46 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -13,11 +13,11 @@ astroid==3.2.4 # -r requirements/test.txt # pylint # pylint-celery -build==1.2.1 +build==1.2.2 # via # -r requirements/pip-tools.txt # pip-tools -cachetools==5.4.0 +cachetools==5.5.0 # via # -r requirements/ci.txt # tox @@ -57,13 +57,13 @@ distlib==0.3.8 # via # -r requirements/ci.txt # virtualenv -django==4.2.15 +django==4.2.16 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt -edx-lint==5.3.7 +edx-lint==5.4.0 # via -r requirements/test.txt -filelock==3.15.4 +filelock==3.16.0 # via # -r requirements/ci.txt # tox @@ -97,7 +97,7 @@ packaging==24.1 # pyproject-api # pytest # tox -pbr==6.0.0 +pbr==6.1.0 # via # -r requirements/test.txt # stevedore @@ -105,7 +105,7 @@ pep257==0.7.0 # via -r requirements/test.txt pip-tools==7.4.1 # via -r requirements/pip-tools.txt -platformdirs==4.2.2 +platformdirs==4.3.2 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -120,7 +120,7 @@ pluggy==1.5.0 # tox pycodestyle==2.12.1 # via -r requirements/test.txt -pylint==3.2.6 +pylint==3.2.7 # via # -r requirements/test.txt # edx-lint @@ -149,14 +149,14 @@ pyproject-hooks==1.1.0 # -r requirements/pip-tools.txt # build # pip-tools -pytest==8.3.2 +pytest==8.3.3 # via # -r requirements/test.txt # pytest-cov # pytest-django pytest-cov==5.0.0 # via -r requirements/test.txt -pytest-django==4.8.0 +pytest-django==4.9.0 # via -r requirements/test.txt python-slugify==8.0.4 # via @@ -174,7 +174,7 @@ sqlparse==0.5.1 # via # -r requirements/test.txt # django -stevedore==5.2.0 +stevedore==5.3.0 # via # -r requirements/test.txt # code-annotations @@ -182,13 +182,13 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify -tomlkit==0.13.0 +tomlkit==0.13.2 # via # -r requirements/test.txt # pylint -tox==4.17.1 +tox==4.18.1 # via -r requirements/ci.txt -virtualenv==20.26.3 +virtualenv==20.26.4 # via # -r requirements/ci.txt # tox diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index fedf88d..84acdf9 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,7 +4,7 @@ # # make upgrade # -build==1.2.1 +build==1.2.2 # via pip-tools click==8.1.7 # via pip-tools diff --git a/requirements/pip.txt b/requirements/pip.txt index 7a6ada8..f313a9c 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==72.1.0 +setuptools==74.1.2 # via -r requirements/pip.in diff --git a/requirements/test.in b/requirements/test.in index 136f8df..2c559a2 100644 --- a/requirements/test.in +++ b/requirements/test.in @@ -5,7 +5,6 @@ coverage edx-lint # edX pylint rules and plugins -pep257 # PEP 257 doc style validation pycodestyle # PEP 8 compliance validation pytest-cov pytest-django diff --git a/requirements/test.txt b/requirements/test.txt index c1800f1..bd222b8 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -30,7 +30,7 @@ dill==0.3.8 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt -edx-lint==5.3.7 +edx-lint==5.4.0 # via -r requirements/test.in iniconfig==2.0.0 # via pytest @@ -44,17 +44,17 @@ mccabe==0.7.0 # via pylint packaging==24.1 # via pytest -pbr==6.0.0 +pbr==6.1.0 # via stevedore pep257==0.7.0 # via -r requirements/test.in -platformdirs==4.2.2 +platformdirs==4.3.2 # via pylint pluggy==1.5.0 # via pytest pycodestyle==2.12.1 # via -r requirements/test.in -pylint==3.2.6 +pylint==3.2.7 # via # edx-lint # pylint-celery @@ -68,13 +68,13 @@ pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django -pytest==8.3.2 +pytest==8.3.3 # via # pytest-cov # pytest-django pytest-cov==5.0.0 # via -r requirements/test.in -pytest-django==4.8.0 +pytest-django==4.9.0 # via -r requirements/test.in python-slugify==8.0.4 # via code-annotations @@ -86,9 +86,9 @@ sqlparse==0.5.1 # via # -r requirements/base.txt # django -stevedore==5.2.0 +stevedore==5.3.0 # via code-annotations text-unidecode==1.3 # via python-slugify -tomlkit==0.13.0 +tomlkit==0.13.2 # via pylint diff --git a/setup.py b/setup.py index 197dc84..d83a290 100644 --- a/setup.py +++ b/setup.py @@ -100,9 +100,9 @@ def get_version(*file_paths): "License :: OSI Approved :: Apache Software License", "Operating System :: OS Independent", "Framework :: Django", - "Framework :: Django :: 3.2", "Framework :: Django :: 4.2", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ] ) diff --git a/tox.ini b/tox.ini index 97128fc..1c14fb7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{32, 42},quality +envlist = py{311,312}-django{42},quality [testenv] deps = @@ -17,4 +17,3 @@ setenv = commands = pycodestyle --config=.pep8 lang_pref_middleware pylint --rcfile=pylintrc lang_pref_middleware - pep257 --ignore=D100,D203 --match='(?!test).*py' lang_pref_middleware