Skip to content

Commit 185b062

Browse files
committed
Use master on travis, update readme and setup.py
1 parent ebb0472 commit 185b062

File tree

3 files changed

+17
-37
lines changed

3 files changed

+17
-37
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cache: pip
44

55
branches:
66
only:
7-
- azure-2.1
7+
- master
88

99
templates:
1010
mssql: &mssql DB_PACKAGES="" DATABASE_URL="mssql://SA:MyPassword42@localhost:1433/default?isolation_level=read committed&driver=ODBC Driver 17 for SQL Server" DATABASE_URL_OTHER="mssql://SA:MyPassword42@localhost:1433/other?isolation_level=read committed&driver=ODBC Driver 17 for SQL Server"

README.rst

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,13 @@
1-
django-pyodbc-azure
2-
===================
1+
django-mssql-backend
2+
====================
33

4-
.. image:: http://img.shields.io/pypi/v/django-pyodbc-azure.svg?style=flat
5-
:target: https://pypi.python.org/pypi/django-pyodbc-azure
6-
7-
.. image:: http://img.shields.io/pypi/l/django-pyodbc-azure.svg?style=flat
8-
:target: http://opensource.org/licenses/BSD-3-Clause
9-
10-
*django-pyodbc-azure* is a modern fork of
11-
`django-pyodbc <https://code.google.com/archive/p/django-pyodbc/>`__, a
12-
`Django <https://www.djangoproject.com/>`__ Microsoft SQL Server external
13-
DB backend that uses ODBC by employing the
14-
`pyodbc <https://github.com/mkleehammer/pyodbc>`__ library. It supports
15-
Microsoft SQL Server and Azure SQL Database.
4+
*django-mssql-backend* is a fork of
5+
`django-pyodbc-azure <https://pypi.org/project/django-pyodbc-azure/>`__
166

177
Features
188
--------
199

20-
- Supports Django 2.1
10+
- Supports Django 2.2
2111
- Supports Microsoft SQL Server 2008/2008R2, 2012, 2014, 2016, 2017 and
2212
Azure SQL Database
2313
- Passes most of the tests of the Django test suite
@@ -29,17 +19,17 @@ Features
2919
Dependencies
3020
------------
3121

32-
- Django 2.1
22+
- Django 2.2
3323
- pyodbc 3.0 or newer
3424

3525
Installation
3626
------------
3727

3828
1. Install pyodbc and Django
3929

40-
2. Install django-pyodbc-azure ::
30+
2. Install django-mssql-backend ::
4131

42-
pip install django-pyodbc-azure
32+
pip install django-mssql-backend
4333

4434
3. Now you can point the ``ENGINE`` setting in the settings file used by
4535
your Django application or project to the ``'sql_server.pyodbc'``
@@ -217,7 +207,7 @@ Here is an example of the database settings:
217207
'default': {
218208
'ENGINE': 'sql_server.pyodbc',
219209
'NAME': 'mydb',
220-
'USER': 'user@myserver',
210+
'USER': 'user@myserver',
221211
'PASSWORD': 'password',
222212
'HOST': 'myserver.database.windows.net',
223213
'PORT': '',
@@ -227,7 +217,7 @@ Here is an example of the database settings:
227217
},
228218
},
229219
}
230-
220+
231221
# set this to False if you want to turn off pyodbc's connection pooling
232222
DATABASE_CONNECTION_POOLING = False
233223

@@ -237,13 +227,3 @@ Limitations
237227
The following features are currently not supported:
238228

239229
- Altering a model field from or to AutoField at migration
240-
241-
Notice
242-
------
243-
244-
This version of *django-pyodbc-azure* only supports Django 2.1.
245-
If you want to use it on older versions of Django,
246-
specify an appropriate version number (2.0.x.x for Django 2.0)
247-
at installation like this: ::
248-
249-
pip install "django-pyodbc-azure<2.1"

setup.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
]
1717

1818
setup(
19-
name='django-pyodbc-azure',
20-
version='2.1.0.0',
19+
name='django-mssql-backend',
20+
version='2.2.0.0',
2121
description='Django backend for Microsoft SQL Server and Azure SQL Database using pyodbc',
2222
long_description=open('README.rst').read(),
23-
author='Michiya Takahashi',
24-
author_email='[email protected]',
25-
url='https://github.com/michiya/django-pyodbc-azure',
23+
author='ES Solutions AB',
24+
author_email='[email protected]',
25+
url='https://github.com/ESSolutions/django-mssql-backend',
2626
license='BSD',
2727
packages=['sql_server', 'sql_server.pyodbc'],
2828
install_requires=[
29-
'Django>=2.1.0,<2.2',
29+
'Django>=2.2,<2.3',
3030
'pyodbc>=3.0',
3131
],
3232
extras_require={

0 commit comments

Comments
 (0)