Skip to content

Commit

Permalink
Fixing up last pieces of tox config and testing
Browse files Browse the repository at this point in the history
  • Loading branch information
carl-tstpd committed May 15, 2023
1 parent 82f64c6 commit ac8a614
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 1,462 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -37,3 +37,5 @@ nosetests.xml
.idea
env.txt
.venv

poetry.lock
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -32,7 +32,7 @@ this causes more trouble than good,
`see discussion <https://github.com/PyCQA/pylint-django/pull/132>`__. If you wish
to automatically install the latest version of ``Django`` then::

pip install pylint-django[with_django]
pip install pylint-django[with-django]

otherwise sort out your testing environment and please **DO NOT** report issues
about missing Django!
Expand Down
1,451 changes: 0 additions & 1,451 deletions poetry.lock

This file was deleted.

2 changes: 1 addition & 1 deletion pylint_django/tests/input/migrations/0002_new_column.txt
@@ -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
new-db-field-with-default:28:8:32:9:Migration:pylint_django.tests.input.migrations.0002_new_column AddField with default value:UNDEFINED
@@ -1,4 +1,4 @@
missing-backwards-migration-callable:12:8:12:30:Migration:Always include backwards migration callable:UNDEFINED
missing-backwards-migration-callable:13:8:13:43:Migration:Always include backwards migration callable:UNDEFINED
missing-backwards-migration-callable:14:8:14:48:Migration:Always include backwards migration callable:UNDEFINED
missing-backwards-migration-callable:15:8:15:62:Migration:Always include backwards migration callable:UNDEFINED
missing-backwards-migration-callable:11:8:11:30:Migration:Always include backwards migration callable:UNDEFINED
missing-backwards-migration-callable:12:8:12:43:Migration:Always include backwards migration callable:UNDEFINED
missing-backwards-migration-callable:13:8:13:48:Migration:Always include backwards migration callable:UNDEFINED
missing-backwards-migration-callable:14:8:14:62:Migration:Always include backwards migration callable:UNDEFINED
2 changes: 1 addition & 1 deletion pylint_django/tests/test_django_not_installed.sh
@@ -1,2 +1,2 @@
#!/bin/bash
pylint --rcfile=tox.ini --load-plugins=pylint_django setup.py | grep django-not-configured
pylint --rcfile=tox.ini --load-plugins=pylint_django pylint_django/ | grep django-not-available
2 changes: 1 addition & 1 deletion scripts/build.sh
Expand Up @@ -68,7 +68,7 @@ echo "..... Trying to install the new tarball inside a virtualenv"
# note: installs with the optional dependency to verify this is still working
virtualenv .venv/test-tarball
source .venv/test-tarball/bin/activate
pip install -f dist/ pylint_django[with_django]
pip install -f dist/ pylint_django[with-django]
pip freeze | grep Django
deactivate
rm -rf .venv/
Expand Down
3 changes: 0 additions & 3 deletions tox.ini
Expand Up @@ -4,7 +4,6 @@
[tox]
envlist =
django_not_installed
django_is_installed
flake8
pylint
readme
Expand All @@ -18,7 +17,6 @@ requires =
[testenv]
commands =
django_not_installed: bash pylint_django/tests/test_django_not_installed.sh
django_is_installed: pylint --rcfile=tox.ini --load-plugins=pylint_django --disable=E5110 setup.py
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/*"
Expand All @@ -27,7 +25,6 @@ commands =
clean: find . -type d -name __pycache__ -delete
clean: rm -rf build/ .cache/ dist/ .eggs/ pylint_django.egg-info/ .tox/
deps =
django_is_installed: Django
flake8: flake8
pylint: pylint
pylint: Django
Expand Down

0 comments on commit ac8a614

Please sign in to comment.