Skip to content

Commit

Permalink
Merge pull request #8 from ambitioninc/develop
Browse files Browse the repository at this point in the history
0.3.0
  • Loading branch information
jaredlewis authored Nov 28, 2016
2 parents 1716156 + f9212f9 commit 736df3c
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ language: python
python:
- '2.7'
- '3.4'
- '3.5'
env:
global:
- DB=postgres
matrix:
- DJANGO=">=1.7,<1.8"
- DJANGO=">=1.8,<1.9"
- DJANGO=">=1.9,<1.10"
install:
- pip install -q coveralls coverage flake8 Django$DJANGO django-nose>=1.4
- pip install -r requirements/docs.txt
Expand Down
6 changes: 3 additions & 3 deletions deletion_side_effects/tests/test_deletion_side_effects.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.contrib.auth.models import User
from django.contrib.contenttypes.models import ContentType
from django.test import SimpleTestCase
from django.test import TransactionTestCase
from django_dynamic_fixture import G
from mock import Mock

Expand All @@ -10,7 +10,7 @@
)


class TestGatherDeletionSideEffects(SimpleTestCase):
class TestGatherDeletionSideEffects(TransactionTestCase):
def setUp(self):
_DELETION_SIDE_EFFECTS.clear()

Expand Down Expand Up @@ -120,7 +120,7 @@ def get_side_effect_message(self, side_effect_objs):
self.assertEquals(set(side_effects[1]['side_effect_objs']), set(users))


class TestRegisterDeletionSideEffects(SimpleTestCase):
class TestRegisterDeletionSideEffects(TransactionTestCase):
def setUp(self):
_DELETION_SIDE_EFFECTS.clear()

Expand Down
2 changes: 1 addition & 1 deletion deletion_side_effects/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.2.0'
__version__ = '0.3.0'
7 changes: 4 additions & 3 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
Release Notes
=============

v0.2.0
v0.3.0
------
* Add python 3.5 support, drop django 1.7 support

v0.2.0
------
* Add support for django 1.9

v0.1.1
------

* Changed the interface for registering deletion side effects

v0.1.0
------

* This is the initial release of django-deletion-side-effects.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ def get_version():
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Framework :: Django :: 1.7',
'Framework :: Django :: 1.8',
'Framework :: Django :: 1.9',
],
license='MIT',
install_requires=[
'django>=1.7',
'django>=1.8',
],
tests_require=[
'psycopg2',
Expand Down

0 comments on commit 736df3c

Please sign in to comment.