Skip to content

Commit 0efb003

Browse files
committed
Added python 3.3 and django 1.5 to test matrix
1 parent e011052 commit 0efb003

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
language: python
22
python:
33
- "2.7"
4+
- "3.3"
45
env:
56
- DJANGO=1.4
7+
- DJANGO=1.5
68
install:
79
- pip install -q Django==$DJANGO --use-mirrors
810
- pip install pep8 --use-mirrors

CHANGELOG

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2013-07-30 2.1.0
2+
3+
- Added experimental Python3 support using 2to3
4+
15
2013-07-30 2.0.9
26

37
Awesome contributions were merged:

docs/source/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
# built documents.
6565
#
6666
# The short X.Y version.
67-
version = '2.0'
67+
version = '2.1'
6868
# The full version, including alpha/beta/rc tags.
69-
release = '2.0.9'
69+
release = '2.1.0'
7070

7171
# The language for content autogenerated by Sphinx. Refer to documentation
7272
# for a list of supported languages.

setup.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
from setuptools import setup, find_packages
2+
import sys
23
import os
34

5+
6+
extra = {}
7+
if sys.version_info >= (3,):
8+
extra['use_2to3'] = True
9+
extra['convert_2to3_doctests'] = ['src/your/module/README.txt']
10+
extra['use_2to3_fixers'] = ['your.fixers']
11+
412
# Utility function to read the README file.
513
# Used for the long_description. It's nice, because now 1) we have a top level
614
# README file and 2) it's easier to type in the README file than to put a raw
@@ -10,7 +18,7 @@ def read(fname):
1018

1119
setup(
1220
name='django-cities-light',
13-
version='2.0.9',
21+
version='2.1.0',
1422
description='Simple alternative to django-cities',
1523
author='James Pic',
1624
author_email='[email protected]',
@@ -35,8 +43,10 @@ def read(fname):
3543
'Operating System :: OS Independent',
3644
'Programming Language :: Python',
3745
'Programming Language :: Python :: 2',
46+
'Programming Language :: Python :: 3',
3847
'Topic :: Internet :: WWW/HTTP',
3948
'Topic :: Software Development :: Libraries :: Python Modules',
40-
]
49+
],
50+
**extra
4151
)
4252

0 commit comments

Comments
 (0)