Release preparations

* nose_setenv removed due to py3 incompatibility

.travis.yml

@@ -2,18 +2,25 @@ language: python
 python:
   - 2.6
   - 2.7
+  - 3.3
 env:
-  - DJANGO=1.3.5
-  - DJANGO=1.4.3
-  - DJANGO=1.5b2
+  global:
+    - DJANGO_SETTINGS_MODULE = twitter_tag.test_settings
+  matrix:
+    - DJANGO=1.3.5
+    - DJANGO=1.4.3
+    - DJANGO=1.5c1
 install:
   - pip install -q https://github.com/django/django/archive/${DJANGO}.zip#egg=django
   - pip install coveralls
   - python setup.py install
 script:
   - coverage run --source=twitter_tag setup.py test
+exclude:
+  - python: 3.3
+    env: DJANGO=1.4.3
 branches:
   only:
     - dev
 after_script:
-  - coveralls --verbose
+  - coveralls

CHANGES.txt

@@ -1,3 +1,9 @@
+1.1
+===
+* Python 3 support
+* max_url_length argument is removed
+* better linkify for mentions and hashtags (ttp dependency removed)
+
 1.0
 ===
 * Twitter API 1.1 based on twitter library

README.rst

@@ -46,8 +46,7 @@ See how it looks like `on our site`_.
 Installation
 ------------
 
-This app works with python 2.6-2.7, Django 1.3-1.5b2.
-Python 3 support is planned in next releases.
+This app works with python 2.6, 2.7 and 3.3, Django 1.3-1.5b2.
 
 Recommended way to install is pip::
 

TODO

@@ -1,11 +1,10 @@
 1.1
 ===
-utf8 search
 refactor get_search_cache_key
-python 3
 
 1.2
 ===
-functional tests
-remove max_url_length option
-Get rid of ttp: display_url in url replace
+twitter lib is masked as arg
+nose_setenv
+utf8 search tests
+functional tests and proper infrastructure

setup.cfg

@@ -1,3 +1,2 @@
 [nosetests]
-nocapture=1
-set-env-variables={'DJANGO_SETTINGS_MODULE': 'twitter_tag.test_settings'}
+nocapture=1

setup.py

@@ -7,31 +7,27 @@
 tests_require = [
     'Django>=1.2',
     'nose==1.2.1',
-    'nose-setenv',
     'mock>=0.7.2',
-    'httpretty',
+    'httpretty>=0.5.9',
     'sure',
     'coveralls',
 ]
 
 setup(
     name='django-twitter-tag',
-    version='1.0',
+    version='1.1dev',
     author='Ilya Baryshev',
     author_email='baryshev@gmail.com',
     packages=find_packages(exclude="tests"),
     url='https://github.com/coagulant/django-twitter-tag',
     license='MIT',
     description="A django template tag to display user's recent tweets.",
     long_description=read(path.join(path.dirname(__file__), 'README.rst')),
-    dependency_links=[
-        'https://github.com/coagulant/twitter-text-python/tarball/master#egg=twitter-text-python-1.0',
-    ],
     install_requires=[
         "django-classy-tags==0.4",
         "twitter==1.9.1",
         "django-appconf==0.6",
-        "twitter-text-python==1.0"
+        'six==1.2.0',
     ],
     tests_require=tests_require,
     test_suite = "nose.collector",
@@ -45,6 +41,6 @@
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 2 :: Only',
+        'Programming Language :: Python :: 3.3',
     ],
 )

tox.ini

@@ -1,10 +1,11 @@
 [testenv]
 downloadcache = {toxworkdir}/_download/
 commands =
-    python setup.py test
+    {envpython} setup.py test
 indexserver =
     default = https://crate.io/
-
+setenv =
+    DJANGO_SETTINGS_MODULE = twitter_tag.test_settings
 
 [testenv:py26-1.3.X]
 basepython = python2.6
@@ -39,4 +40,10 @@ deps =
 [testenv:py27-1.5.X]
 basepython = python2.7
 deps =
-    git+https://github.com/django/django.git#egg=django
+    git+https://github.com/django/django.git#egg=django
+
+
+[testenv:py33-1.5.X]
+basepython = python3.3
+deps =
+    https://github.com/django/django/archive/1.5c1.zip#egg=django