Permalink
Browse files

Python 3 support is done, thanks to RevSys & the PSF! Updated require…

…ments in the docs.
  • Loading branch information...
1 parent 1db3fdd commit a752f1f8e8b02fdd6affe091d61047737fc8aa84 @toastdriven toastdriven committed Jul 28, 2013
Showing with 12 additions and 24 deletions.
  1. +1 −0 AUTHORS
  2. +1 −1 LICENSE
  3. +4 −3 README.rst
  4. +2 −18 docs/index.rst
  5. +4 −2 setup.py
View
@@ -83,3 +83,4 @@ Thanks to
* Andrew Schoen (andrewschoen) for the addition of ``HAYSTACK_IDENTIFIER_METHOD``
* Pablo SEMINARIO (pabluk) for a docs fix.
* Eric Thurgood (ethurgood) for a import fix in the Elasticssearch backend.
+ * Revolution Systems & The Python Software Foundation for funding a significant portion of the port to Python 3!
View
@@ -1,4 +1,4 @@
-Copyright (c) 2009-2012, Daniel Lindsley.
+Copyright (c) 2009-2013, Daniel Lindsley.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
View
@@ -3,7 +3,7 @@ Haystack
========
:author: Daniel Lindsley
-:date: 2013/04/28
+:date: 2013/07/28
Haystack provides modular search for Django. It features a unified, familiar
API that allows you to plug in different search backends (such as Solr_,
@@ -33,6 +33,7 @@ Documentation
=============
* Development version: http://docs.haystacksearch.org/
+* v2.1.X: http://django-haystack.readthedocs.org/en/v2.1.0/
* v2.0.X: http://django-haystack.readthedocs.org/en/v2.0.0/
* v1.2.X: http://django-haystack.readthedocs.org/en/v1.2.7/
* v1.1.X: http://django-haystack.readthedocs.org/en/v1.1/
@@ -43,8 +44,8 @@ Requirements
Haystack has a relatively easily-met set of requirements.
-* Python 2.5+
-* Django 1.3+
+* Python 2.6+ or Python 3.3+
+* Django 1.5+
Additionally, each backend has its own requirements. You should refer to
http://docs.haystacksearch.org/dev/installing_search_engines.html for more
View
@@ -110,24 +110,8 @@ Requirements
Haystack has a relatively easily-met set of requirements.
-* Python 2.5+
-* Django 1.3+
+* Python 2.6+
+* Django 1.5+
Additionally, each backend has its own requirements. You should refer to
:doc:`installing_search_engines` for more details.
-
-
-Commercial Support
-==================
-
-If you're using Haystack in a commercial environment, paid support is available
-from `Toast Driven`_. Services offered include:
-
-* Advice/help with setup
-* Implementation in your project
-* Bugfixes in Haystack itself
-* Features in Haystack itself
-
-If you're interested, please contact Daniel Lindsley (daniel@toastdriven.com).
-
-.. _`Toast Driven`: http://toastdriven.com/
View
@@ -10,7 +10,7 @@
setup(
name='django-haystack',
- version='2.0.1-dev',
+ version='2.1.0',
description='Pluggable search for Django.',
author='Daniel Lindsley',
author_email='daniel@toastdriven.com',
@@ -38,7 +38,9 @@
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
- 'Topic :: Utilities'
+ 'Programming Language :: Python :: 2',
+ 'Programming Language :: Python :: 3',
+ 'Topic :: Utilities',
],
zip_safe=False,
)

0 comments on commit a752f1f

Please sign in to comment.