Merge branch '173-deprecate-django-1.6' of https://github.com/pydanny…

…/dj-stripe.git into 173-deprecate-django-1.6
AdvisorStream · May 30, 2015 · fbe0886 · fbe0886
2 parents 154da6e + effdc3e
commit fbe0886
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,9 +3,11 @@
 History
 =======
 
-0.5.0 (2015-05-??)
+0.5.0 (2015-05-25)
 ---------------------
 
+* Began deprecation of support for Django 1.6 and lower.
+* Added formal support for Django 1.8.
 * Removed the StripeSubscriptionSignupForm
 * Removed ``djstripe.safe_settings``. Settings are now all located in ``djstripe.settings``
 * ``DJSTRIPE_TRIAL_PERIOD_FOR_SUBSCRIBER_CALLBACK`` can no longer be a module string

diff --git a/README.rst b/README.rst
@@ -15,7 +15,7 @@ Badges
         :target: https://pypi.python.org/pypi/dj-stripe/
 
 .. image:: https://badges.gitter.im/Join Chat.svg
-        :target: https://gitter.im/audreyr/cookiecutter?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+        :target: https://gitter.im/pydanny/dj-stripe?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 
 Django + Stripe Made Easy
 
@@ -151,11 +151,11 @@ Follows Best Practices
    :name: Two Scoops Logo
    :align: center
    :alt: Two Scoops of Django
-   :target: http://twoscoopspress.org/products/two-scoops-of-django-1-6
+   :target: http://twoscoopspress.org/products/two-scoops-of-django-1-8
 
-This project follows best practices as espoused in `Two Scoops of Django: Best Practices for Django 1.6`_.
+This project follows best practices as espoused in `Two Scoops of Django: Best Practices for Django 1.8`_.
 
-.. _`Two Scoops of Django: Best Practices for Django 1.6`: http://twoscoopspress.org/products/two-scoops-of-django-1-6
+.. _`Two Scoops of Django: Best Practices for Django 1.8`: http://twoscoopspress.org/products/two-scoops-of-django-1-8
 
 Similar Projects
 ----------------

diff --git a/djstripe/__init__.py b/djstripe/__init__.py
@@ -7,7 +7,7 @@
 __summary__ = "Django + Stripe Made Easy"
 __uri__ = "https://github.com/pydanny/dj-stripe/"
 
-__version__ = "0.4.0"
+__version__ = "0.5.0"
 
 __author__ = "Daniel Greenfeld"
 __email__ = "[email protected]"

diff --git a/setup.py b/setup.py
@@ -56,6 +56,8 @@
         'Development Status :: 3 - Alpha',
         'Environment :: Web Environment',
         'Framework :: Django',
+        'Framework :: Django :: 1.7',
+        'Framework :: Django :: 1.8',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',