Merge pull request microsoft#4 from microsoft/dev

vwarchu · web-flow · commit b57a443bc810 · 2020-12-19T19:28:53.000-08:00
Update doc files and add copyright comments to all source python files
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -6,4 +6,4 @@ Resources:
 
 - [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
 - [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
-- Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns
+- Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,15 @@
+# Contributing
+
+## How to contribute
+
+This project welcomes contributions and suggestions.  Most contributions require you to agree to a
+Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
+the rights to use your contribution. For details, visit https://cla.opensource.microsoft.com.
+
+When you submit a pull request, a CLA bot will automatically determine whether you need to provide
+a CLA and decorate the PR appropriately (e.g., status check, comment). Simply follow the instructions
+provided by the bot. You will only need to do this once across all repos using our CLA.
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
+contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,3 +1,5 @@
+Project Name: mssql-django
+
 MIT License
 
 Copyright (c) Microsoft Corporation.
diff --git a/README.md b/README.md
@@ -1,12 +1,9 @@
 # Project
 
-.. image:: https://img.shields.io/pypi/v/django-mssql-backend.svg
-   :target: https://pypi.python.org/pypi/django-mssql-backend
-
 Welcome to the MSSQL-Django 3rd party backend project!
 
-*django-mssql-backend* is a fork of
-`django-pyodbc-azure <https://pypi.org/project/django-pyodbc-azure/>`
+*mssql-django* is a fork of
+`django-mssql-backend <https://pypi.org/project/django-mssql-backend/>`
 
 This project provides an enterprise database connectivity option for the Django Web Framework, with support for Microsoft SQL Server and Azure SQL Database.
 
@@ -245,6 +242,10 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
 For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
 contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
 
+## Security Reporting Instructions
+
+For security reporting instructions please refer to the SECURITY.md file in this repository.
+
 ## Trademarks
 
 This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft 
diff --git a/SECURITY.md b/SECURITY.md
@@ -1,6 +1,4 @@
-<!-- BEGIN MICROSOFT SECURITY.MD V0.0.5 BLOCK -->
-
-## Security
+# Security
 
 Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
 
diff --git a/manage.py b/manage.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 #!/usr/bin/env python
 import os
 import sys
diff --git a/setup.py b/setup.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from setuptools import find_packages, setup
 
 CLASSIFIERS = [
diff --git a/sql_server/pyodbc/__init__.py b/sql_server/pyodbc/__init__.py
@@ -1 +1,4 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import sql_server.pyodbc.functions  # noqa
diff --git a/sql_server/pyodbc/base.py b/sql_server/pyodbc/base.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 """
 MS SQL Server database backend for Django.
 """
diff --git a/sql_server/pyodbc/client.py b/sql_server/pyodbc/client.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import re
 import subprocess
 
diff --git a/sql_server/pyodbc/compiler.py b/sql_server/pyodbc/compiler.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import types
 from itertools import chain
 
diff --git a/sql_server/pyodbc/creation.py b/sql_server/pyodbc/creation.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import binascii
 import os
 
diff --git a/sql_server/pyodbc/features.py b/sql_server/pyodbc/features.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from django.db.backends.base.features import BaseDatabaseFeatures
 from django.utils.functional import cached_property
 
diff --git a/sql_server/pyodbc/functions.py b/sql_server/pyodbc/functions.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from django import VERSION
 from django.db.models import BooleanField
 from django.db.models.functions import Cast
diff --git a/sql_server/pyodbc/introspection.py b/sql_server/pyodbc/introspection.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import pyodbc as Database
 
 from django.db.backends.base.introspection import (
diff --git a/sql_server/pyodbc/management/commands/install_regex_clr.py b/sql_server/pyodbc/management/commands/install_regex_clr.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 # Add regex support in SQLServer
 # Code taken from django-mssql (see https://bitbucket.org/Manfre/django-mssql)
 
diff --git a/sql_server/pyodbc/operations.py b/sql_server/pyodbc/operations.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import datetime
 import uuid
 import warnings
diff --git a/sql_server/pyodbc/schema.py b/sql_server/pyodbc/schema.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import binascii
 import datetime
 
diff --git a/testapp/models.py b/testapp/models.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import uuid
 
 from django.db import models
diff --git a/testapp/settings.py b/testapp/settings.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 import dj_database_url
 
 DATABASES = {
diff --git a/testapp/tests/test_constraints.py b/testapp/tests/test_constraints.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from django.db.utils import IntegrityError
 from django.test import TestCase, skipUnlessDBFeature
 
diff --git a/testapp/tests/test_expressions.py b/testapp/tests/test_expressions.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from unittest import skipUnless
 
 from django import VERSION
diff --git a/testapp/tests/test_fields.py b/testapp/tests/test_fields.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
 from django.test import TestCase
 
 from ..models import UUIDModel

-Original file line number
+Diff line change
 - [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
 - [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
 -- Contact [[email protected]](mailto:[email protected]) with questions or concerns
 +- Contact [[email protected]](mailto:[email protected]) with questions or concerns
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+Project Name: mssql-django`
	`2`	`+`
`1`	`3`	`MIT License`
`2`	`4`
`3`	`5`	`Copyright (c) Microsoft Corporation.`