Skip to content

Commit

Permalink
Merge branch 'azure-1.11' into azure-2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
michiya committed Mar 9, 2018
2 parents a5be65a + 10da334 commit a476080
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
7 changes: 3 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,19 @@ Microsoft SQL Server and Azure SQL Database.
Features
--------

- Supports Django 2.0.1
- Supports Django 2.0.3
- Supports Microsoft SQL Server 2008/2008R2, 2012, 2014, 2016, 2017 and
Azure SQL Database
- Supports LIMIT+OFFSET and offset w/o LIMIT emulation
- Passes most of the tests of the Django test suite
- Compatible with
`Micosoft ODBC Driver for SQL Server <https://docs.microsoft.com/en-us/sql/connect/odbc/microsoft-odbc-driver-for-sql-server>`__,
`SQL Server Native Client <https://msdn.microsoft.com/en-us/library/ms131321(v=sql.120).aspx>`__,
and `FreeTDS <http://www.freetds.org/>`__ ODBC drivers.
and `FreeTDS <http://www.freetds.org/>`__ ODBC drivers

Dependencies
------------

- Django 2.0.1
- Django 2.0.3
- pyodbc 3.0 or newer

Installation
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

setup(
name='django-pyodbc-azure',
version='2.0.1.0',
version='2.0.3.0',
description='Django backend for Microsoft SQL Server and Azure SQL Database using pyodbc',
long_description=open('README.rst').read(),
author='Michiya Takahashi',
Expand All @@ -26,7 +26,7 @@
license='BSD',
packages=['sql_server', 'sql_server.pyodbc'],
install_requires=[
'Django>=2.0.1,<2.1',
'Django>=2.0.3,<2.1',
'pyodbc>=3.0',
],
classifiers=CLASSIFIERS,
Expand Down
2 changes: 1 addition & 1 deletion sql_server/pyodbc/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from django.core.exceptions import ImproperlyConfigured
from django import VERSION

if VERSION[:3] < (2,0,1) or VERSION[:2] >= (2,1):
if VERSION[:3] < (2,0,3) or VERSION[:2] >= (2,1):
raise ImproperlyConfigured("Django %d.%d.%d is not supported." % VERSION[:3])

try:
Expand Down

0 comments on commit a476080

Please sign in to comment.