From 4e5b0f1da1d3b20ddf71a777bf8059c53752c415 Mon Sep 17 00:00:00 2001 From: Carl Crowder Date: Fri, 20 Oct 2023 09:51:24 +0700 Subject: [PATCH 01/16] Triggering CI actions for branch fixing CI actions... --- .github/workflows/build.yml | 6 ++++-- tox.ini | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a2cdf20..8f62a8cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,8 +2,10 @@ name: build on: push: - branches: master - pull_request: + branches: + - master + - fix-ci-actions + pull_request: jobs: sanity: diff --git a/tox.ini b/tox.ini index e32a00bd..02673773 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ envlist = pylint readme py{37,38,39}-django{22,30,31,32} - py{38,39,310,311}-django{40,41,42} + py{38,39,310,311,312}-django{40,41,42} requires = pip >=21.0.1 From e017fc921d8a63466d69636d5cfbbedff4936883 Mon Sep 17 00:00:00 2001 From: Carl Crowder Date: Fri, 20 Oct 2023 09:54:37 +0700 Subject: [PATCH 02/16] tmp will be squashed, CI debug by YAML hell --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f62a8cc..ad421a72 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: - name: Execute tests run: | pip install -U pip poetry tox - poetry install -E for_tests + poetry install export TOXENV=${{ matrix.toxenv }} export PYTHON=${{ matrix.python-version }} From 36e190997103bf3c80bd522122c894eec856b4d0 Mon Sep 17 00:00:00 2001 From: Carl Crowder Date: Fri, 20 Oct 2023 09:58:59 +0700 Subject: [PATCH 03/16] tmp will be squashed, CI debug by YAML hell --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad421a72..9fd4e748 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,7 @@ jobs: - name: Execute tests run: | pip install -U pip poetry tox - poetry install -E for_tests + poetry install export DJANGO=${{ matrix.django-version }} export PYTHON=${{ matrix.python-version }} @@ -87,7 +87,7 @@ jobs: - name: Execute tests run: | pip install -U pip poetry tox - poetry install -E for_tests + poetry install export DJANGO=${{ matrix.django-version }} export PYTHON=${{ matrix.python-version }} @@ -118,6 +118,6 @@ jobs: - name: Build run: | pip install -U pip poetry tox - poetry install -E for_tests + poetry install ./scripts/build.sh From 4d11c034e76a57ad66b05e259401f73ed33d68df Mon Sep 17 00:00:00 2001 From: Carl Crowder Date: Fri, 20 Oct 2023 10:04:24 +0700 Subject: [PATCH 04/16] tmp will be squashed, CI debug by YAML hell --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9fd4e748..9fdcfa2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.8, 3.9, "3.10", "3.11"] + python-version: [3.8, 3.9, "3.10", "3.11", "3.12"] django-version: [-main, "4.0"] steps: @@ -53,6 +53,7 @@ jobs: - name: Execute tests run: | pip install -U pip poetry tox + poetry config virtualenvs.create false poetry install export DJANGO=${{ matrix.django-version }} From 6e6adbb7380d1e218bd6129a8d2c1017c96c3e8e Mon Sep 17 00:00:00 2001 From: Carl Crowder Date: Fri, 20 Oct 2023 10:07:18 +0700 Subject: [PATCH 05/16] tmp will be squashed, CI debug by YAML hell --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9fdcfa2c..fceb0fa4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,7 +59,7 @@ jobs: export DJANGO=${{ matrix.django-version }} export PYTHON=${{ matrix.python-version }} export TOXENV=$(echo py${{ matrix.python-version }}-django${{ matrix.django-version }} | tr -d .) - tox + poetry run tox - name: Coveralls env: From 271e6e2e323c6f3c71bd6456fde68c165038f6ca Mon Sep 17 00:00:00 2001 From: Carl Crowder Date: Fri, 20 Oct 2023 10:12:49 +0700 Subject: [PATCH 06/16] tmp will be squashed, CI debug by YAML hell --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fceb0fa4..eb44f3db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,7 +59,7 @@ jobs: export DJANGO=${{ matrix.django-version }} export PYTHON=${{ matrix.python-version }} export TOXENV=$(echo py${{ matrix.python-version }}-django${{ matrix.django-version }} | tr -d .) - poetry run tox + tox - name: Coveralls env: @@ -88,6 +88,7 @@ jobs: - name: Execute tests run: | pip install -U pip poetry tox + poetry config virtualenvs.create false poetry install export DJANGO=${{ matrix.django-version }} From 33ef20d8d452cde0050ba1302ac1cc90b24aad43 Mon Sep 17 00:00:00 2001 From: Carl Crowder Date: Fri, 20 Oct 2023 10:18:04 +0700 Subject: [PATCH 07/16] tmp will be squashed, CI debug by YAML hell --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eb44f3db..3c4bad08 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,6 +55,7 @@ jobs: pip install -U pip poetry tox poetry config virtualenvs.create false poetry install + pip install pytest # ffs export DJANGO=${{ matrix.django-version }} export PYTHON=${{ matrix.python-version }} From ca79b5bc99221fd78490891195a87265a21c2e6f Mon Sep 17 00:00:00 2001 From: Carl Crowder Date: Fri, 20 Oct 2023 11:58:27 +0700 Subject: [PATCH 08/16] tmp will be squashed, CI debug by YAML hell --- tox.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tox.ini b/tox.ini index 02673773..8dae8e81 100644 --- a/tox.ini +++ b/tox.ini @@ -32,8 +32,11 @@ deps = readme: twine readme: wheel django22: Django>=2.2,<3.0 + django22: pytest django30: Django>=3.0,<3.1 + django30: pytest django31: Django>=3.1,<3.2 + django31: pytest django32: Django>=3.2,<4.0 django40: Django>=4.0,<4.1 django41: Django>=4.1,<4.2 From a29c7d0062fe9909c3ebd4fd1363e2a96a640c44 Mon Sep 17 00:00:00 2001 From: Carl Crowder Date: Fri, 20 Oct 2023 12:06:14 +0700 Subject: [PATCH 09/16] tmp will be squashed, CI debug by YAML hell --- .github/workflows/build.yml | 2 +- tox.ini | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c4bad08..2db61d94 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: test: - name: test latest / Django@${{ matrix.django-version }} / Python@${{ matrix.python-version }} + name: test latest / P@${{ matrix.python-version }} / D@${{ matrix.django-version }} runs-on: ubuntu-latest strategy: fail-fast: false diff --git a/tox.ini b/tox.ini index 8dae8e81..02673773 100644 --- a/tox.ini +++ b/tox.ini @@ -32,11 +32,8 @@ deps = readme: twine readme: wheel django22: Django>=2.2,<3.0 - django22: pytest django30: Django>=3.0,<3.1 - django30: pytest django31: Django>=3.1,<3.2 - django31: pytest django32: Django>=3.2,<4.0 django40: Django>=4.0,<4.1 django41: Django>=4.1,<4.2 From 775c1cd8684204bf4318c9874f82c0fe060b7361 Mon Sep 17 00:00:00 2001 From: Carl Crowder Date: Fri, 20 Oct 2023 12:07:58 +0700 Subject: [PATCH 10/16] tmp will be squashed, CI debug by YAML hell --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2db61d94..c8111750 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,7 +71,7 @@ jobs: coveralls --service=github test_deprecated: # testing older versions of python+django - name: test old stuff / Django@${{ matrix.django-version }} / Python@${{ matrix.python-version }} + name: test old stuff / P@${{ matrix.python-version }} / D@${{ matrix.django-version }} runs-on: ubuntu-latest strategy: # TODO: use a YAML anchor - not supported in GitHub actions "yet" fail-fast: false From efbc26c482e28840e0371d1a09b2ea0696cb353e Mon Sep 17 00:00:00 2001 From: Carl Crowder Date: Fri, 20 Oct 2023 12:30:56 +0700 Subject: [PATCH 11/16] tmp will be squashed, CI debug by YAML hell --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 02673773..bc708835 100644 --- a/tox.ini +++ b/tox.ini @@ -9,6 +9,7 @@ envlist = readme py{37,38,39}-django{22,30,31,32} py{38,39,310,311,312}-django{40,41,42} +skipsdist = True requires = pip >=21.0.1 From 1b5b745e4eeabdceb9014c06a02b60d6f3e3d7a9 Mon Sep 17 00:00:00 2001 From: Carl Crowder Date: Fri, 20 Oct 2023 12:41:32 +0700 Subject: [PATCH 12/16] tmp will be squashed, CI debug by YAML hell --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 95f29234..be33e56b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,10 +44,10 @@ python = ">=3.7,<4.0" pylint-plugin-utils = ">=0.8" pylint = ">=2.0,<3" Django = {version=">=2.2", optional = true} +pytest = "^7.3.1" [tool.poetry.group.dev.dependencies] tox = "^4.5.1" -pytest = "^7.3.1" pylint = ">=2.13" twine = "^4.0.2" wheel = "^0.40.0" From 8fd812beeeadf2a9cdcd6e236bbdd96b1fd596ef Mon Sep 17 00:00:00 2001 From: Carl Crowder Date: Fri, 20 Oct 2023 12:41:45 +0700 Subject: [PATCH 13/16] tmp will be squashed, CI debug by YAML hell --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index be33e56b..8a9ad688 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,9 +44,9 @@ python = ">=3.7,<4.0" pylint-plugin-utils = ">=0.8" pylint = ">=2.0,<3" Django = {version=">=2.2", optional = true} -pytest = "^7.3.1" [tool.poetry.group.dev.dependencies] +pytest = "^7.3.1" tox = "^4.5.1" pylint = ">=2.13" twine = "^4.0.2" From 342c591eda1233640e8b6ef4b294d24bc78f91fe Mon Sep 17 00:00:00 2001 From: Carl Crowder Date: Sun, 22 Oct 2023 08:39:33 +0700 Subject: [PATCH 14/16] tmp will be squashed, CI debug by YAML hell --- pyproject.toml | 17 +++++++++-------- scripts/test.sh | 3 +++ tox.ini | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8a9ad688..7ee3c891 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ readme = "README.rst" description = "A Pylint plugin to help Pylint understand the Django web framework" repository = "https://github.com/PyCQA/pylint-django" authors = ["Carl Crowder "] -classifiers=[ +classifiers = [ "Development Status :: 5 - Production/Stable", "Environment :: Console", "Intended Audience :: Developers", @@ -17,6 +17,7 @@ classifiers=[ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Framework :: Django :: 2.2", "Framework :: Django :: 3", "Framework :: Django :: 3.0", @@ -28,14 +29,14 @@ classifiers=[ "Framework :: Django :: 4.2", "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)", ] -keywords=["pylint", "django", "plugin"] +keywords = ["pylint", "django", "plugin"] packages = [ - { include = "pylint_django/"} + { include = "pylint_django/" } ] include = [ - "LICENSE", - "*.rst", - "*.md" + "LICENSE", + "*.rst", + "*.md" ] exclude = ["**/tests/**", "**/testutils.py", "**/tests.py"] @@ -43,10 +44,9 @@ exclude = ["**/tests/**", "**/testutils.py", "**/tests.py"] python = ">=3.7,<4.0" pylint-plugin-utils = ">=0.8" pylint = ">=2.0,<3" -Django = {version=">=2.2", optional = true} +Django = { version = ">=2.2", optional = true } [tool.poetry.group.dev.dependencies] -pytest = "^7.3.1" tox = "^4.5.1" pylint = ">=2.13" twine = "^4.0.2" @@ -55,6 +55,7 @@ pytest-cov = "^4.0.0" django-tables2 = "^2.6.0" factory-boy = "^3.3.0" django-tastypie = "^0.14.6" +pytest = "^7.3.1" [tool.poetry.extras] with_django = ["Django"] diff --git a/scripts/test.sh b/scripts/test.sh index ca5be46c..1c3a7b21 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -1,2 +1,5 @@ #!/bin/bash +# TODO : find out why tox refuses to install this or install any dev dependencies from poetry :-| +pip install 'pytest>=7.3.1' + python pylint_django/tests/test_func.py -v "$@" diff --git a/tox.ini b/tox.ini index bc708835..cba6590c 100644 --- a/tox.ini +++ b/tox.ini @@ -22,7 +22,7 @@ commands = flake8: flake8 pylint_django/ pylint: pylint --rcfile=tox.ini -d missing-docstring,too-many-branches,too-many-return-statements,too-many-ancestors,fixme --ignore=tests pylint_django readme: bash -c "poetry build && twine check dist/*" - py{37,38,39,310,311}-django{22,30,31,32,40,41,42}: bash scripts/test.sh --cov=pylint_django + py{37,38,39,310,311}-django{22,30,31,32,40,41,42}: bash scripts/test.sh clean: find . -type f -name '*.pyc' -delete clean: find . -type d -name __pycache__ -delete clean: rm -rf build/ .cache/ dist/ .eggs/ pylint_django.egg-info/ .tox/ From 0f4b76443008b65533d0447328a32cd4594be8b5 Mon Sep 17 00:00:00 2001 From: Carl Crowder Date: Sun, 22 Oct 2023 08:43:27 +0700 Subject: [PATCH 15/16] tmp will be squashed, CI debug by YAML hell --- .github/workflows/build.yml | 2 +- tox.ini | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c8111750..c0bd3859 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,7 @@ jobs: fail-fast: false matrix: python-version: [3.8, 3.9, "3.10", "3.11", "3.12"] - django-version: [-main, "4.0"] + django-version: [-main, "4.0", "4.1", "4.2"] steps: - uses: actions/checkout@v3 diff --git a/tox.ini b/tox.ini index cba6590c..051f40c7 100644 --- a/tox.ini +++ b/tox.ini @@ -15,6 +15,8 @@ requires = pip >=21.0.1 poetry tox + pylint = ">=2.13,<3" + [testenv] commands = From f46d956d0d6d62f3a254dcb4546e98ef4390a62d Mon Sep 17 00:00:00 2001 From: Carl Crowder Date: Sun, 22 Oct 2023 08:46:31 +0700 Subject: [PATCH 16/16] tmp will be squashed, CI debug by YAML hell --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 051f40c7..9a70d9a7 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,7 @@ requires = pip >=21.0.1 poetry tox - pylint = ">=2.13,<3" + pylint >=2.13,<3 [testenv]