Skip to content

Commit 57a15ac

Browse files
author
Carl Crowder
committed
Beginning cleanup of build, versions and similar to fix CI (#376), remove deprecated versions of python/django (#400) and start upgrading to be compatible with python 3.0+ (#405)
1 parent 347ad70 commit 57a15ac

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

pyproject.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,20 @@ python = ">=3.7,<4.0"
4444
pylint-plugin-utils = ">=0.8"
4545
pylint = ">=2.0,<3"
4646
Django = {version=">=2.2", optional = true}
47-
django-tables2 = {version="^2.5.3", optional = true}
48-
factory-boy = {version="^3.2.1", optional = true}
49-
django-tastypie = {version="^0.14.5", optional = true}
5047

5148
[tool.poetry.group.dev.dependencies]
5249
tox = "^4.5.1"
5350
pytest = "^7.3.1"
5451
pylint = ">=2.13"
55-
coverage = "^7.2.5"
5652
twine = "^4.0.2"
5753
wheel = "^0.40.0"
54+
pytest-cov = "^4.0.0"
55+
django-tables2 = "^2.6.0"
56+
factory-boy = "^3.3.0"
57+
django-tastypie = "^0.14.6"
5858

5959
[tool.poetry.extras]
6060
with_django = ["Django"]
61-
for_tests = ['django-tastypie', 'django-tables2', 'factory-boy']
6261

6362
[build-system]
6463
requires = ["poetry-core>=1.0.0"]

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ commands =
2121
flake8: flake8 pylint_django/
2222
pylint: pylint --rcfile=tox.ini -d missing-docstring,too-many-branches,too-many-return-statements,too-many-ancestors,fixme --ignore=tests pylint_django
2323
readme: bash -c "poetry build && twine check dist/*"
24-
py{37,38,39,310,311}-django{22,30,31,32,40,41,42}: coverage run pylint_django/tests/test_func.py -v
24+
py{37,38,39,310,311}-django{22,30,31,32,40,41,42}: bash scripts/test.sh --cov=pylint_django
2525
clean: find . -type f -name '*.pyc' -delete
2626
clean: find . -type d -name __pycache__ -delete
2727
clean: rm -rf build/ .cache/ dist/ .eggs/ pylint_django.egg-info/ .tox/
@@ -47,7 +47,7 @@ setenv =
4747
allowlist_externals =
4848
django_not_installed: bash
4949
readme: bash
50-
py{37,38,39,310,311}-django{22,30,31,32,40,41,42}: coverage
50+
py{37,38,39,310,311}-django{22,30,31,32,40,41,42}: bash
5151
clean: find
5252
clean: rm
5353

0 commit comments

Comments
 (0)