Skip to content

Commit

Permalink
Merge pull request #47 from ambitioninc/develop
Browse files Browse the repository at this point in the history
0.8.0
  • Loading branch information
somewes authored Sep 18, 2017
2 parents c143ac9 + eaec3d9 commit 4b79e3c
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 11 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ python:
- '2.7'
- '3.4'
- '3.5'
- '3.6'
env:
global:
- DB=postgres
matrix:
- DJANGO=">=1.8,<1.9"
- DJANGO=">=1.9,<1.10"
- DJANGO=">=1.10,<1.11"
- DJANGO=">=1.11,<2.0"
install:
- pip install -q coverage flake8 Django$DJANGO django-nose>=1.4
before_script:
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Josh Marlow @joshmarlow [email protected] (primary)
Wes Okes @wesokes [email protected] (primary)
Wes Kendall @wesleykendall [email protected] (secondary)
Cardinal-DeepSea-Blues (https://github.com/Cardinal-DeepSea-Blues)
9 changes: 9 additions & 0 deletions dynamic_initial_data/docs/release_notes.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Release Notes
=============

v0.8.0
------
* Add python 3.6 support
* Drop Django 1.8 support
* Add Django 1.10 support
* Add Django 1.11 support
11 changes: 4 additions & 7 deletions dynamic_initial_data/management/commands/update_initial_data.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
from optparse import make_option

from django.core.management.base import BaseCommand

from dynamic_initial_data.base import InitialDataUpdater


class Command(BaseCommand):
option_list = BaseCommand.option_list + (
make_option(
def add_arguments(self, parser):
parser.add_argument(
'--verbose', action='store_true', dest='verbose', default=False,
help='Determines if we should display which apps are being updated'
),
make_option(
)
parser.add_argument(
'--app', dest='app', default=None, help='Updates a single app'
)
)

help = 'Call the InitialData.update_initial_data command for all apps. Use --app to update only one app.'

Expand Down
2 changes: 1 addition & 1 deletion dynamic_initial_data/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.7.0'
__version__ = '0.8.0'
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,16 @@ def get_version():
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Framework :: Django',
],
license='MIT',
install_requires=[
'django>=1.8',
'django-manager-utils>=0.12.0',
'Django>=1.9',
'django-manager-utils>=0.13.0',
],
tests_require=[
'psycopg2',
Expand Down

0 comments on commit 4b79e3c

Please sign in to comment.