Skip to content

Commit

Permalink
Merge pull request #786 from jaap3/patch-1
Browse files Browse the repository at this point in the history
Also test against Python 3.9 /  Django 3.2
  • Loading branch information
craigds committed Jun 9, 2021
2 parents d2ae6e0 + 2ec5cf8 commit 688f2dd
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
dist: xenial
language: python
cache: pip
git:
depth: 1

python:
- "3.9"
- "3.8"
- "3.7"
- "3.6"
Expand All @@ -13,11 +13,12 @@ env:
- DJANGO="Django==2.2.*"
- DJANGO="Django==3.0.*"
- DJANGO="Django==3.1.*"
- DJANGO="https://github.com/django/django/archive/master.tar.gz"
- DJANGO="Django==3.2.*"
- DJANGO="https://github.com/django/django/archive/main.tar.gz"

matrix:
allow_failures:
- env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
- env: DJANGO="https://github.com/django/django/archive/main.tar.gz"

before_install: pip install --upgrade pip

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Django >= 1.11
Django >= 2.2
django-js-asset
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
packages=find_packages(exclude=["tests", "tests.*"]),
include_package_data=True,
install_requires=[
"Django>=1.11",
"Django>=2.2",
"django-js-asset",
],
python_requires=">=3.6",
Expand All @@ -27,14 +27,17 @@
"Framework :: Django :: 2.2",
"Framework :: Django :: 3.0",
"Framework :: Django :: 3.1",
"Framework :: Django :: 3.2",
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Topic :: Utilities",
Expand Down
1 change: 1 addition & 0 deletions tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

DEBUG = True
DATABASES = {"default": {"ENGINE": "django.db.backends.sqlite3", "NAME": "mydatabase"}}
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'

INSTALLED_APPS = (
"django.contrib.admin",
Expand Down
11 changes: 5 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
[tox]
envlist =
{py36,py37,py38}-{dj22}
{py36,py37,py38}-{dj30}
{py36,py37,py38}-{dj31}
py{36,37,38,39}-dj{22,30,31,32}

[testenv]
changedir = {toxinidir}/tests
commands = ./runtests.sh {posargs}
deps =
mock_django>=0.6.7
dj22: Django>=2.2,<3.0
dj30: Django>=3.0,<3.1
dj31: Django>=3.1,<3.2
dj22: Django~=2.2.0
dj30: Django~=3.0.0
dj31: Django~=3.1.0
dj32: Django~=3.2.0

[testenv:style]
deps =
Expand Down

0 comments on commit 688f2dd

Please sign in to comment.