Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the Django requirement from this application #49

Merged
merged 3 commits into from
May 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@ matrix:
python: 3.6
- env: TOXENV=py36-dj111-wag23
python: 3.6
- env: TOXENV=py36-dj20-wag23
python: 3.6
- env: TOXENV=py36-dj22-wag23
python: 3.6
- env: TOXENV=py36-dj22-wag28
- env: TOXENV=py36-dj22-wag29
python: 3.6
- env: TOXENV=py38-dj22-wag28
- env: TOXENV=py38-dj22-wag29
python: 3.8

install:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Wagtail-Flags adds a Wagtail admin UI and Wagtail Site-based condition on top of
## Dependencies

- Python 3.6, 3.8
- Django 1.11, 2.0, 2.2
- Wagtail 2.3, 2.8
- Wagtail 2.3, 2.9
- Django 1.11, 2.2
- Django-Flags 4.2+

It should be compatible at all intermediate versions, as well.
Expand Down
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from setuptools import find_packages, setup

install_requires = ["wagtail>=2.3,<2.9", "django-flags>=4.2,<5.0"]
install_requires = ["wagtail>=2.3,<2.10", "django-flags>=4.2,<5.0"]

testing_extras = ["coverage>=3.7.0"]

Expand All @@ -13,16 +13,14 @@
long_description=open("README.md", "r").read(),
long_description_content_type="text/markdown",
license="CC0",
version="4.2.0",
version="4.2.1",
include_package_data=True,
packages=find_packages(),
install_requires=install_requires,
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 :: Wagtail",
"Framework :: Wagtail :: 2",
Expand Down
10 changes: 4 additions & 6 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}-dj{111,22}-wag{23},
py{36,38}-dj{22}-wag{29}

[testenv]
install_command=pip install -e ".[testing]" -U {opts} {packages}
Expand All @@ -20,11 +20,9 @@ basepython=

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

[testenv:lint]
basepython=python3.6
Expand Down