Skip to content

Commit 054b49a

Browse files
author
Carl Crowder
committed
Fixing up last pieces of tox config and testing
1 parent 82f64c6 commit 054b49a

File tree

10 files changed

+29
-1484
lines changed

10 files changed

+29
-1484
lines changed

‎.github/workflows/build.yml

+18-18
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
python-version: [3.6]
16-
toxenv: [django_not_installed, django_is_installed, flake8, pylint, readme]
15+
python-version: [3.7]
16+
toxenv: [django_not_installed, flake8, pylint, readme]
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
2020
- name: Set up Python ${{ matrix.python-version }}
21-
uses: actions/setup-python@v1
21+
uses: actions/setup-python@v4
2222
with:
2323
python-version: ${{ matrix.python-version }}
2424

2525
- name: Execute tests
2626
run: |
27-
pip install tox
28-
pip install -e .[for_tests]
27+
pip install -U pip poetry tox
28+
poetry install -E for_tests
2929
3030
export TOXENV=${{ matrix.toxenv }}
3131
export PYTHON=${{ matrix.python-version }}
@@ -42,16 +42,16 @@ jobs:
4242
django-version: [-main, "4.0"]
4343

4444
steps:
45-
- uses: actions/checkout@v2
45+
- uses: actions/checkout@v3
4646
- name: Set up Python ${{ matrix.python-version }}
47-
uses: actions/setup-python@v1
47+
uses: actions/setup-python@v4
4848
with:
4949
python-version: ${{ matrix.python-version }}
5050

5151
- name: Execute tests
5252
run: |
53-
pip install tox
54-
pip install -e .[for_tests]
53+
pip install -U pip poetry tox
54+
poetry install -E for_tests
5555
5656
export DJANGO=${{ matrix.django-version }}
5757
export PYTHON=${{ matrix.python-version }}
@@ -76,16 +76,16 @@ jobs:
7676
django-version: [3.2, 3.1, "3.0", "2.0", "2.2", "1.11"]
7777

7878
steps:
79-
- uses: actions/checkout@v2
79+
- uses: actions/checkout@v3
8080
- name: Set up Python ${{ matrix.python-version }}
81-
uses: actions/setup-python@v1
81+
uses: actions/setup-python@v4
8282
with:
8383
python-version: ${{ matrix.python-version }}
8484

8585
- name: Execute tests
8686
run: |
87-
pip install tox
88-
pip install -e .[for_tests]
87+
pip install -U pip poetry tox
88+
poetry install -E for_tests
8989
9090
export DJANGO=${{ matrix.django-version }}
9191
export PYTHON=${{ matrix.python-version }}
@@ -107,15 +107,15 @@ jobs:
107107
python-version: [3.7]
108108

109109
steps:
110-
- uses: actions/checkout@v2
110+
- uses: actions/checkout@v3
111111
- name: Set up Python ${{ matrix.python-version }}
112-
uses: actions/setup-python@v1
112+
uses: actions/setup-python@v4
113113
with:
114114
python-version: ${{ matrix.python-version }}
115115

116116
- name: Build
117117
run: |
118-
pip install tox
119-
pip install -e .[for_tests]
118+
pip install -U pip poetry tox
119+
poetry install -E for_tests
120120
121121
./scripts/build.sh

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,5 @@ nosetests.xml
3737
.idea
3838
env.txt
3939
.venv
40+
41+
poetry.lock

‎README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ this causes more trouble than good,
3232
`see discussion <https://github.com/PyCQA/pylint-django/pull/132>`__. If you wish
3333
to automatically install the latest version of ``Django`` then::
3434

35-
pip install pylint-django[with_django]
35+
pip install pylint-django[with-django]
3636

3737
otherwise sort out your testing environment and please **DO NOT** report issues
3838
about missing Django!

‎SECURITY.md

-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,3 @@ In case you have found a security problem with pylint-django *DO NOT* report
1212
it into GitHub Issues. Instead go to
1313
[https://tidelift.com/security](https://tidelift.com/security)
1414
and follow the instructions there.
15-
16-
At least one of the package maintainers ([@atodorov](http://github.com/atodorov))
17-
is a lifter at Tidelift and will be notified when you report the security
18-
problem with them!

‎poetry.lock

-1,451
This file was deleted.

‎pylint_django/tests/input/migrations/0002_new_column.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
new-db-field-with-default:29:8:33:9:Migration:pylint_django.tests.input.migrations.0002_new_column AddField with default value:UNDEFINED
1+
new-db-field-with-default:28:8:32:9:Migration:pylint_django.tests.input.migrations.0002_new_column AddField with default value:UNDEFINED

‎pylint_django/tests/input/migrations/0003_without_backwards.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
missing-backwards-migration-callable:12:8:12:30:Migration:Always include backwards migration callable:UNDEFINED
2-
missing-backwards-migration-callable:13:8:13:43:Migration:Always include backwards migration callable:UNDEFINED
3-
missing-backwards-migration-callable:14:8:14:48:Migration:Always include backwards migration callable:UNDEFINED
4-
missing-backwards-migration-callable:15:8:15:62:Migration:Always include backwards migration callable:UNDEFINED
1+
missing-backwards-migration-callable:11:8:11:30:Migration:Always include backwards migration callable:UNDEFINED
2+
missing-backwards-migration-callable:12:8:12:43:Migration:Always include backwards migration callable:UNDEFINED
3+
missing-backwards-migration-callable:13:8:13:48:Migration:Always include backwards migration callable:UNDEFINED
4+
missing-backwards-migration-callable:14:8:14:62:Migration:Always include backwards migration callable:UNDEFINED

‎pylint_django/tests/test_django_not_installed.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash
2-
pylint --rcfile=tox.ini --load-plugins=pylint_django setup.py | grep django-not-configured
2+
pylint --rcfile=tox.ini --load-plugins=pylint_django pylint_django/ | grep django-not-available

‎scripts/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ echo "..... Trying to install the new tarball inside a virtualenv"
6868
# note: installs with the optional dependency to verify this is still working
6969
virtualenv .venv/test-tarball
7070
source .venv/test-tarball/bin/activate
71-
pip install -f dist/ pylint_django[with_django]
71+
pip install -f dist/ pylint_django[with-django]
7272
pip freeze | grep Django
7373
deactivate
7474
rm -rf .venv/

‎tox.ini

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
[tox]
55
envlist =
66
django_not_installed
7-
django_is_installed
87
flake8
98
pylint
109
readme
@@ -13,12 +12,12 @@ envlist =
1312

1413
requires =
1514
pip >=21.0.1
15+
poetry
1616
tox
1717

1818
[testenv]
1919
commands =
2020
django_not_installed: bash pylint_django/tests/test_django_not_installed.sh
21-
django_is_installed: pylint --rcfile=tox.ini --load-plugins=pylint_django --disable=E5110 setup.py
2221
flake8: flake8 pylint_django/
2322
pylint: pylint --rcfile=tox.ini -d missing-docstring,too-many-branches,too-many-return-statements,too-many-ancestors,fixme --ignore=tests pylint_django
2423
readme: bash -c "poetry build && twine check dist/*"
@@ -27,7 +26,6 @@ commands =
2726
clean: find . -type d -name __pycache__ -delete
2827
clean: rm -rf build/ .cache/ dist/ .eggs/ pylint_django.egg-info/ .tox/
2928
deps =
30-
django_is_installed: Django
3129
flake8: flake8
3230
pylint: pylint
3331
pylint: Django

0 commit comments

Comments
 (0)