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 Jun 10, 2018
2 parents 79fcbf3 + 2be54e6 commit c541f16
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Microsoft SQL Server and Azure SQL Database.
Features
--------

- Supports Django 2.0.4
- Supports Django 2.0.6
- Supports Microsoft SQL Server 2008/2008R2, 2012, 2014, 2016, 2017 and
Azure SQL Database
- Passes most of the tests of the Django test suite
Expand All @@ -29,7 +29,7 @@ Features
Dependencies
------------

- Django 2.0.4
- Django 2.0.6
- 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.4.1',
version='2.0.6.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.4,<2.1',
'Django>=2.0.6,<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,4) or VERSION[:2] >= (2,1):
if VERSION[:3] < (2,0,6) or VERSION[:2] >= (2,1):
raise ImproperlyConfigured("Django %d.%d.%d is not supported." % VERSION[:3])

try:
Expand Down

0 comments on commit c541f16

Please sign in to comment.