Skip to content

Commit

Permalink
Merge 04e4e77 into e0ed333
Browse files Browse the repository at this point in the history
  • Loading branch information
yakky committed May 4, 2020
2 parents e0ed333 + 04e4e77 commit 606ee67
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ env:
matrix:
- DJANGO='django30'
- DJANGO='django22'
- DJANGO='django111'
- TOXENV='pep8'
- TOXENV='isort'
- TOXENV='docs'
Expand Down
3 changes: 2 additions & 1 deletion HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ History
0.4.0 (unrelease)
++++++++++++++++++

* Migrated to Chanels 2
* Migrated to Channels 2
* Added support for Django 2.2 / 3.0
* Dropped support for Python 2
* Dropped support for Django < 2.2

0.3.3 (2018-01-01)
++++++++++++++++++
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def get_version(*file_paths):
],
include_package_data=True,
install_requires=[
'channels>=2.4',
'channels>=2.3',
'django-meta>=1.4'
],
test_suite='cms_helper.run',
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ setenv =
PYTHONPATH = {toxinidir}:{toxinidir}/knocker
commands = {env:COMMAND:python} cms_helper.py test
deps =
django111: Django>=1.11,<2.0
-r{toxinidir}/requirements-test.txt
django22: Django>=2.2,<3.0
django30: Django>=3.0,<3.1
-r{toxinidir}/requirements-test.txt

[testenv:pep8]
deps = flake8
Expand Down

0 comments on commit 606ee67

Please sign in to comment.