Skip to content

Commit

Permalink
Merge pull request #14 from ambitioninc/develop
Browse files Browse the repository at this point in the history
0.6.0
  • Loading branch information
somewes authored Sep 19, 2017
2 parents 01d3441 + 84e23fb commit 78c55f1
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 15 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 coveralls coverage flake8 Django$DJANGO django-nose>=1.4
- pip install -r requirements/docs.txt
Expand Down
14 changes: 7 additions & 7 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
Release Notes
=============

v0.5.0
v0.6.0
------
* Add python 3.6 support
* Remove Django 1.8 support
* Add Django 1.10 support
* Add Django 1.11 support

v0.5.0
------
* Add python 3.5 support, remove django 1.7

v0.4.0
------

* Added Django 1.9 support

v0.2.0
------

* Dropped Django 1.6 support
* Added Python 3.4 support

v0.1.1
------

* Made the slack API call be one call instead of multiple calls per push

* Added the ability to configure an icon url for the slack bot

* Added the ability to configure the user name for the slack bot

v0.1
----

* This is the initial release of django-entity-event-slack.
2 changes: 1 addition & 1 deletion entity_event_slack/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.5.0'
__version__ = '0.6.0'
7 changes: 6 additions & 1 deletion publish.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import subprocess

subprocess.call(['rm', '-r', 'dist/'])
subprocess.call(['pip', 'install', 'wheel'])
subprocess.call(['pip', 'install', 'twine'])
subprocess.call(['python', 'setup.py', 'clean', '--all'])
subprocess.call(['python', 'setup.py', 'register', 'sdist', 'bdist_wheel', 'upload'])
subprocess.call(['python', 'setup.py', 'register', 'sdist', 'bdist_wheel'])
subprocess.call(['twine', 'upload', 'dist/*'])
subprocess.call(['rm', '-r', 'dist/'])
subprocess.call(['rm', '-r', 'build/'])
6 changes: 6 additions & 0 deletions settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,10 @@ def configure_settings():
DEBUG=False,
TEST_RUNNER='django_nose.NoseTestSuiteRunner',
NOSE_ARGS=['--nocapture', '--nologcapture', '--verbosity=1'],
TEMPLATES=[
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'APP_DIRS': True,
},
]
)
12 changes: 7 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,22 @@ 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',
'Framework :: Django :: 1.8',
'Framework :: Django :: 1.9',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
],
license='MIT',
install_requires=[
'celery>=3.1,<4.0',
'Django>=1.8',
'django-db-mutex>=0.4.0',
'django-entity-event>=0.6.0',
'django-manager-utils>=0.12.0',
'Django>=1.9',
'django-db-mutex>=0.5.0',
'django-entity-event>=0.8.0',
'django-manager-utils>=0.13.0',
'pyslack>=0.1.3',
'requests',
],
Expand Down

0 comments on commit 78c55f1

Please sign in to comment.