Skip to content
Browse files

Merge branch 'develop'

Conflicts:
	README.rst
	makefile
  • Loading branch information...
2 parents 080708a + 03aef9a commit dd219253c615cefb88bc00efa53fcf248f7f18eb @codeinthehole committed Dec 1, 2012
Showing with 18 additions and 11 deletions.
  1. +8 −1 README.rst
  2. +10 −1 makefile
  3. +0 −9 release.sh
View
9 README.rst
@@ -2,7 +2,7 @@
django-async-messages
=====================
-Simple asynchronous messages for django.
+Simple asynchronous messages for django. Plays nicely with Celery.
Questions
=========
@@ -121,6 +121,13 @@ Run tests with::
Please submit pull requests using 'develop' as the target branch.
+License
+=======
+
+MIT_
+
+.. _MIT: http://en.wikipedia.org/wiki/MIT_License
+
Changelog
=========
View
11 makefile
@@ -1,3 +1,12 @@
install:
python setup.py develop
- pip install -r requirements.txt
+ pip install -r requirements.txt
+
+test:
+ ./runtests.py
+
+release:
+ git checkout master
+ python setup.py sdist upload
+ git push origin master
+ git push --tags
View
9 release.sh
@@ -1,9 +0,0 @@
-#!/bin/bash
-# Cut a release to PyPi and update Github with tag.
-
-# Push to PyPi
-./setup.py sdist upload
-
-# Tag in Git
-git push origin master
-git push --tags

0 comments on commit dd21925

Please sign in to comment.
Something went wrong with that request. Please try again.