Skip to content

Commit b667e1d

Browse files
committed
Merge branch 'azure' into azure-1.1
Conflicts: setup.py
2 parents 91393f2 + e185f0b commit b667e1d

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

setup.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#!/usr/bin/env python
2-
3-
from distutils.core import setup
1+
try:
2+
from setuptools import setup
3+
except ImportError:
4+
from distutils.core import setup
45

56
CLASSIFIERS=[
67
'Development Status :: 4 - Beta',
@@ -25,5 +26,9 @@
2526
url='https://github.com/michiya/django-pyodbc-azure',
2627
license='BSD',
2728
packages=['sql_server', 'sql_server.pyodbc'],
29+
install_requires=[
30+
'Django>=1.6',
31+
'pyodbc>=3.0',
32+
],
2833
classifiers=CLASSIFIERS,
2934
)

0 commit comments

Comments
 (0)