Commit 47559c67 authored by Chris Routh's avatar Chris Routh 🐰

Update for Django 3.0

parent 9555d949
Pipeline #4635 passed with stage
in 4 minutes and 27 seconds
......@@ -12,8 +12,7 @@ pylint:
stage: code-review
when: always
tags:
- docker
- dev
- build
- docker-mode
script:
- tox -e pylint
......@@ -25,11 +24,10 @@ tests:
stage: code-review
when: always
tags:
- docker
- dev
- build
- docker-mode
script:
- tox -e py36-2.1,py36-2.2,py36-master,py37-2.1,py37-2.2,py37-master
- tox -e py36-2.2,py36-3.0,py36-master,py37-2.2,py37-3.0,py37-master
artifacts:
paths:
- reports/
......@@ -43,8 +41,7 @@ requires.io:
only:
- master
tags:
- docker
- dev
- build
- docker-mode
script:
- pip install requires.io
......@@ -57,8 +54,8 @@ pages:
stage: deploy
when: on_success
tags:
- dev
- shell-mode
- build
- docker-mode
dependencies:
- tests
script:
......@@ -82,8 +79,7 @@ test-pypi:
TWINE_USERNAME: ${TEST_PYPI_USER}
TWINE_PASSWORD: ${TEST_PYPI_PASSWORD}
tags:
- docker
- dev
- build
- docker-mode
script:
- pip install --upgrade setuptools wheel twine
......@@ -101,8 +97,7 @@ pypi:
TWINE_USERNAME: ${PYPI_USER}
TWINE_PASSWORD: ${PYPI_PASSWORD}
tags:
- docker
- dev
- build
- docker-mode
script:
- pip install --upgrade setuptools wheel twine
......
......@@ -37,7 +37,7 @@ Requirements
* Python 3.6 or above
* setuptools 30.3.0 or above
* Django 2.0 or above
* Django 2.2 or above
Install
......
......@@ -38,6 +38,7 @@ TIDYFIELDS_DEFAULT = {
STRIP_TIDYWRAP_REGEX = re.compile(r'^<tidywrap>(.*)</tidywrap>$', flags=re.DOTALL)
def tidy_input(field_contents="", **kwargs):
"""
Take contents of field and arguments for `lxml.html.clean.Cleaner` and return sanitized string.
......
......@@ -12,8 +12,8 @@ author_email = chris@routh.io
keywords = django, lxml, input, html, fields
classifiers =
Framework :: Django
Framework :: Django :: 2.1
Framework :: Django :: 2.2
Framework :: Django :: 3.0
Intended Audience :: Developers
License :: OSI Approved :: MIT License
Programming Language :: Python :: 3.6
......@@ -26,7 +26,7 @@ include_package_data = True
packages = find:
install_requires =
lxml==4.3.3
Django>=2.1
Django>=2.2
tests_require =
pytest==4.0.1
pytest-django==3.4.4
......
[tox]
envlist = {py36,py37}-{2.1,2.2,master},pylint,isort,docs
envlist = {py36,py37}-{2.2,3.0,master},pylint,isort,docs
recreate = True
skip_missing_interpreters = true
......@@ -8,8 +8,8 @@ extras =
tests
coverage
deps =
2.1: Django>=2.1,<2.2
2.2: Django>=2.2,<2.3
3.0: Django>=3.0,<3.1
master: https://github.com/django/django/tarball/master
coverage
diff_cover
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment