Skip to content

Commit

Permalink
Remove the Django requirement from this application
Browse files Browse the repository at this point in the history
We should probably only pin Wagtail in this application, and support
the version range for Django that our Wagtail version specifies.
  • Loading branch information
cwdavies committed May 4, 2020
1 parent 536c247 commit f6d558a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 18 deletions.
10 changes: 4 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@ matrix:
include:
- env: TOXENV=lint
python: 3.6
- env: TOXENV=py36-dj111-wag23
- env: TOXENV=py36-wag23
python: 3.6
- env: TOXENV=py36-dj20-wag23
- env: TOXENV=py36-wag28
python: 3.6
- env: TOXENV=py36-dj22-wag28
python: 3.6
- env: TOXENV=py38-dj20-wag23
- env: TOXENV=py38-wag23
python: 3.8
- env: TOXENV=py38-dj22-wag28
- env: TOXENV=py38-wag28
python: 3.8

install:
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ Wagtail-TreeModelAdmin is an extension for Wagtail's [ModelAdmin](http://docs.wa
## Dependencies

- Python 3.6, 3.8
- Django 1.11, 2.0, 2.2
- Wagtail 2.3, 2.8

It should be compatible with all intermediate versions, as well.
Expand Down
8 changes: 2 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@


install_requires = [
"Django>=1.11,<2.3",
"wagtail>=2.3,<2.9",
]

Expand All @@ -26,7 +25,7 @@
long_description=long_description,
long_description_content_type="text/markdown",
license="CC0",
version="1.1.1",
version="1.2.0",
include_package_data=True,
packages=find_packages(),
package_data={
Expand All @@ -40,10 +39,7 @@
extras_require={"testing": testing_extras},
classifiers=[
"Framework :: Django",
"Framework :: Django :: 1.11",
"Framework :: Django :: 2.0",
"Framework :: Django :: 2.1",
"Framework :: Django :: 2.2",
"Framework :: Django :: 3",
"Framework :: Wagtail",
"Framework :: Wagtail :: 2",
"License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
Expand Down
7 changes: 2 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
skipsdist=True
envlist=
lint,
py{36}-dj{111,20,22}-wag{23},
py{36,38}-dj{22}-wag{28}
py{36}--wag23,
py{36,38}-wag28

[testenv]
install_command=pip install -e ".[testing]" -U {opts} {packages}
Expand All @@ -19,9 +19,6 @@ basepython=
py38: python3.8

deps=
dj111: Django>=1.11,<1.12
dj20: Django>=2.0,<2.1
dj22: Django>=2.2,<2.3
wag23: wagtail>=2.3,<2.4
wag28: wagtail>=2.8,<2.9

Expand Down

0 comments on commit f6d558a

Please sign in to comment.