Skip to content

Commit 7242a74

Browse files
committed
upgrade supported Django version to 1.6
1 parent dd87bd3 commit 7242a74

File tree

13 files changed

+507
-960
lines changed

13 files changed

+507
-960
lines changed

README.rst

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SQL Server and Windows Azure SQL Database.
1111
Features
1212
--------
1313

14-
- Supports Django 1.2, 1.3, 1.4, 1.5
14+
- Supports Django 1.6
1515
- Supports MS SQL Server 2005, 2008/2008R2, 2012, and Windows Azure SQL
1616
Database
1717
- Supports LIMIT+OFFSET and offset w/o LIMIT emulation.
@@ -22,8 +22,8 @@ Features
2222
Dependencies
2323
------------
2424

25-
- Django 1.2 or newer
26-
- pyodbc 2.1 or newer
25+
- Django 1.6
26+
- pyodbc 3.0 or newer
2727

2828
Installation
2929
------------
@@ -76,6 +76,11 @@ Standard Django settings
7676

7777
String. Database user password.
7878

79+
- AUTOCOMMIT
80+
81+
Boolean. Set this to False if you want to disable
82+
Django's transaction management and implement your own.
83+
7984
- TEST_NAME
8085

8186
String. The name of database to use when running the test suite.
@@ -111,11 +116,6 @@ OPTIONS
111116

112117
Dictionary. Current available keys are:
113118

114-
- autocommit
115-
116-
Boolean. Indicates if pyodbc should direct the ODBC driver to
117-
activate the autocommit feature. Default value is ``False``.
118-
119119
- MARS_Connection
120120

121121
Boolean. Only relevant when using Microsoft's SQL Server drivers
@@ -221,6 +221,15 @@ Instead of Django's standard ones, you can use them like this: ::
221221

222222
And you can use Django's standard classes for other aggregating operations.
223223

224+
Notice
225+
------
226+
227+
This version of *django-pyodbc-azure* only supports Django 1.6.
228+
Specify the old version (1.0.x) at installation if you want to use it
229+
on Django 1.5 or earlier: ::
230+
231+
pip install "django-pyodbc-azure<1.1"
232+
224233
License
225234
=======
226235

setup.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
'Framework :: Django',
99
'Programming Language :: Python',
1010
'Programming Language :: Python :: 2',
11-
'Programming Language :: Python :: 2.4',
12-
'Programming Language :: Python :: 2.5',
1311
'Programming Language :: Python :: 2.6',
1412
'Programming Language :: Python :: 2.7',
1513
'Programming Language :: Python :: 3',
@@ -20,7 +18,7 @@
2018

2119
setup(
2220
name='django-pyodbc-azure',
23-
version='1.0.10',
21+
version='1.1.0',
2422
description='Django backend for MS SQL Server and Windows Azure SQL Database using pyodbc',
2523
long_description=open('README.rst').read(),
2624
author='Michiya Takahashi',

sql_server/extra/__init__.py

Whitespace-only changes.

sql_server/extra/management/__init__.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

sql_server/extra/management/commands/__init__.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)