Skip to content

Commit

Permalink
Merge pull request #33 from dabapps/version-changes
Browse files Browse the repository at this point in the history
Version changes
  • Loading branch information
RealOrangeOne authored Nov 4, 2019
2 parents 107c016 + 985d0e1 commit 6ed7837
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 31 deletions.
28 changes: 16 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
language: python
python:
- "2.7"
- "3.6"
- "3.7"

env:
- DJANGO_VERSION=1.8
- DJANGO_VERSION=1.11
- DJANGO_VERSION=2.2

matrix:
exclude:
- python: '2.7'
env: 'DJANGO_VERSION=2.2'

install:
- pip install tox
- pip install -U Django==$DJANGO_VERSION
- pip install -r requirements.txt

script:
- tox
env:
- TOXENV=py27-django14
- TOXENV=py27-django18
- TOXENV=py27-django19
- TOXENV=py27-django110
- TOXENV=py27-django111
- TOXENV=py36-django18
- TOXENV=py36-django19
- TOXENV=py36-django110
- TOXENV=py36-django111
- ./manage.py test
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
author = 'Jamie Matthews'
author_email = '[email protected]'
license = 'BSD'
install_requires = ["django>=1.3"]
install_requires = ["django>=1.8"]


def get_version(package):
Expand Down
2 changes: 1 addition & 1 deletion testproject/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
MIDDLEWARE_CLASSES = [
'log_request_id.middleware.RequestIDMiddleware',
# ... other middleware goes here
] + list(global_settings.MIDDLEWARE_CLASSES)
] + list(getattr(global_settings, "MIDDLEWARE_CLASSES", []))

LOGGING = {
'version': 1,
Expand Down
17 changes: 0 additions & 17 deletions tox.ini

This file was deleted.

0 comments on commit 6ed7837

Please sign in to comment.