Skip to content

Commit ac8a614

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

File tree

8 files changed

+10
-1462
lines changed

8 files changed

+10
-1462
lines changed

.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!

poetry.lock

-1,451
This file was deleted.
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
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
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

-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
@@ -18,7 +17,6 @@ requires =
1817
[testenv]
1918
commands =
2019
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
2220
flake8: flake8 pylint_django/
2321
pylint: pylint --rcfile=tox.ini -d missing-docstring,too-many-branches,too-many-return-statements,too-many-ancestors,fixme --ignore=tests pylint_django
2422
readme: bash -c "poetry build && twine check dist/*"
@@ -27,7 +25,6 @@ commands =
2725
clean: find . -type d -name __pycache__ -delete
2826
clean: rm -rf build/ .cache/ dist/ .eggs/ pylint_django.egg-info/ .tox/
2927
deps =
30-
django_is_installed: Django
3128
flake8: flake8
3229
pylint: pylint
3330
pylint: Django

0 commit comments

Comments
 (0)