Skip to content

Commit 1187381

Browse files
authored
Legal stuff to make CELA happy (#5)
1 parent d96c036 commit 1187381

File tree

6 files changed

+2383
-29
lines changed

6 files changed

+2383
-29
lines changed

CODE_OF_CONDUCT.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
This project has adopted the [Microsoft Open Source Code of
2+
Conduct](https://opensource.microsoft.com/codeofconduct/).
3+
For more information see the [Code of Conduct
4+
FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
5+
6+
with any additional questions or comments.

CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## Prerequisites
66
1. Node.js
7-
2. Python v2.6 or later (required only for testing the extension and running unit tests)
7+
2. Python 2.7 or later (required only for testing the extension and running unit tests)
88
3. Windows, OS X or Linux
99

1010
## Setup
@@ -25,18 +25,18 @@ To test the changes you launch a development version of VS Code on the workspace
2525
Use the "Launch Extension" launch option.
2626

2727
### Unit Tests
28-
Run the Unit Tests via the "Launch Test" launch option.
28+
Run the Unit Tests via the "Launch Test" launch option.
2929
Currently unit tests only run on [Travis](https://travis-ci.org/DonJayamanne/pythonVSCode)
3030

31-
_Requirements_
32-
1. Ensure you have disabled breaking into 'Uncaught Exceptions' when running the Unit Tests
33-
2. For the linters and formatters tests to pass successfully, you will need to have those corresponding Python libraries installed locally
31+
_Requirements_
32+
1. Ensure you have disabled breaking into 'Uncaught Exceptions' when running the Unit Tests
33+
2. For the linters and formatters tests to pass successfully, you will need to have those corresponding Python libraries installed locally
3434

3535
## Debugging the extension
3636
### Standard Debugging
3737
Clone the repo into any directory and start debugging.
38-
From there use the "Launch Extension" launch option.
38+
From there use the "Launch Extension" launch option.
3939

4040
### Debugging the Python Extension Debugger
41-
The easiest way to debug the Python Debugger (in my opinion) is to clone this git repo directory into [your](https://code.visualstudio.com/docs/extensions/install-extension#_your-extensions-folder) extensions directory.
41+
The easiest way to debug the Python Debugger (in our opinion) is to clone this git repo directory into [your](https://code.visualstudio.com/docs/extensions/install-extension#_your-extensions-folder) extensions directory.
4242
From there use the ```Launch Extension as debugserver``` launch option.

LICENSE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
The MIT License (MIT)
1+
Copyright (c) Microsoft Corporation. All rights reserved.
22

3-
Copyright (c) 2015 DonJayamanne
3+
MIT License
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -12,7 +12,7 @@ furnished to do so, subject to the following conditions:
1212
The above copyright notice and this permission notice shall be included in all
1313
copies or substantial portions of the Software.
1414

15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1616
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1717
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

README.md

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Python
22

3-
An extension with rich support for the [Python language](https://www.python.org/) (_including Python 3.6_), with features including the following and more:
4-
* Linting ([Prospector](https://pypi.io/project/prospector/), [Pylint](https://pypi.io/project/pylint/), [pycodestyle/pep257/pep8](https://pypi.io/project/pycodestyle/), [Flake8](https://pypi.io/project/flake8/), [pylama](https://github.com/klen/pylama), [pydocstyle](https://pypi.io/project/pydocstyle/), [mypy](http://mypy-lang.org/) with config files and plugins)
3+
An extension with rich support for the [Python language](https://www.python.org/) (_including Python 3.6_), with features including the following and more:
4+
* Linting ([Prospector](https://pypi.io/project/prospector/), [Pylint](https://pypi.io/project/pylint/), [pycodestyle/pep257/pep8](https://pypi.io/project/pycodestyle/), [Flake8](https://pypi.io/project/flake8/), [pylama](https://github.com/klen/pylama), [pydocstyle](https://pypi.io/project/pydocstyle/), [mypy](http://mypy-lang.org/) with config files and plugins)
55
* Intellisense (autocompletion with support for PEP-0484 and PEP 526)
66
* Auto indenting
77
* Code formatting ([autopep8](https://pypi.io/project/autopep8/), [yapf](https://pypi.io/project/yapf/), with config files)
@@ -18,14 +18,14 @@ An extension with rich support for the [Python language](https://www.python.org/
1818
* optionally install `ctags` for Workspace Symbols, from [here](http://ctags.sourceforge.net/), or using `brew install ctags` on OSX.
1919
* If Python is in the current path
2020
+ You're ready to use it.
21-
* To select a different Python Interpreter/Version (or use Virtual Environment), use the command [```Select Workspace Interpreter```](https://github.com/DonJayamanne/pythonVSCode/wiki/Miscellaneous#select-an-interpreter))
21+
* To select a different Python Interpreter/Version (or use Virtual Environment), use the command [```Select Workspace Interpreter```](https://github.com/DonJayamanne/pythonVSCode/wiki/Miscellaneous#select-an-interpreter))
2222

2323
## [Documentation](https://github.com/DonJayamanne/pythonVSCode/wiki)
2424
For further information and details continue through to the [documentation](https://github.com/DonJayamanne/pythonVSCode/wiki).
2525

2626
## [Issues, Feature Requests and Contributions](https://github.com/DonJayamanne/pythonVSCode/issues)
2727
* Contributions are always welcome. Fork it, modify it and create a pull request.
28-
+ Details on contributing can be found [here](https://github.com/DonJayamanne/pythonVSCode/wiki/Contribution)
28+
+ Details on contributing can be found [here](https://github.com/DonJayamanne/pythonVSCode/wiki/Contribution)
2929
* Any and all feedback is appreciated and welcome.
3030
+ Please feel free to [add suggestions here](https://github.com/DonJayamanne/pythonVSCode/issues/183)
3131

@@ -58,7 +58,7 @@ For further information and details continue through to the [documentation](http
5858
+ Custom plugins such as pylint plugin for Django can be easily used by modifying the settings as follows:
5959
```json
6060
"python.linting.pylintArgs": ["--load-plugins", "pylint_django"]
61-
```
61+
```
6262
* [Debugging](https://github.com/DonJayamanne/pythonVSCode/wiki/Debugging)
6363
+ Watch window
6464
+ Evaluate Expressions
@@ -101,23 +101,33 @@ For further information and details continue through to the [documentation](http
101101
## [Change Log](https://github.com/DonJayamanne/pythonVSCode/blob/master/CHANGELOG.md)
102102

103103
### Version 0.7.0 (3 August 2017)
104-
* Displaying internal documntation [#1008](https://github.com/DonJayamanne/pythonVSCode/issues/1008), [#10860](https://github.com/DonJayamanne/pythonVSCode/issues/10860)
105-
* Fixes to 'async with' snippet [#1108](https://github.com/DonJayamanne/pythonVSCode/pull/1108), [#996](https://github.com/DonJayamanne/pythonVSCode/issues/996)
106-
* Add support for environment variable in unit tests [#1074](https://github.com/DonJayamanne/pythonVSCode/issues/1074)
107-
* Fixes to unit test code lenses not being displayed [#1115](https://github.com/DonJayamanne/pythonVSCode/issues/1115)
108-
* Fix to empty brackets being added [#1110](https://github.com/DonJayamanne/pythonVSCode/issues/1110), [#1031](https://github.com/DonJayamanne/pythonVSCode/issues/1031)
109-
* Fix debugging of Django applications [#819](https://github.com/DonJayamanne/pythonVSCode/issues/819), [#999](https://github.com/DonJayamanne/pythonVSCode/issues/999)
110-
* Update isort to the latest version [#1134](https://github.com/DonJayamanne/pythonVSCode/issues/1134), [#1135](https://github.com/DonJayamanne/pythonVSCode/pull/1135)
111-
* Fix issue causing intellisense and similar functionality to stop working [#1072](https://github.com/DonJayamanne/pythonVSCode/issues/1072), [#1118](https://github.com/DonJayamanne/pythonVSCode/pull/1118), [#1089](https://github.com/DonJayamanne/pythonVSCode/issues/1089)
112-
* Bunch of unit tests and code cleanup
113-
* Resolve issue where navigation to decorated function goes to decorator [#742](https://github.com/DonJayamanne/pythonVSCode/issues/742)
114-
* Go to symbol in workspace leads to nonexisting files [#816](https://github.com/DonJayamanne/pythonVSCode/issues/816), [#829](https://github.com/DonJayamanne/pythonVSCode/issues/829)
104+
* Displaying internal documntation [#1008](https://github.com/DonJayamanne/pythonVSCode/issues/1008), [#10860](https://github.com/DonJayamanne/pythonVSCode/issues/10860)
105+
* Fixes to 'async with' snippet [#1108](https://github.com/DonJayamanne/pythonVSCode/pull/1108), [#996](https://github.com/DonJayamanne/pythonVSCode/issues/996)
106+
* Add support for environment variable in unit tests [#1074](https://github.com/DonJayamanne/pythonVSCode/issues/1074)
107+
* Fixes to unit test code lenses not being displayed [#1115](https://github.com/DonJayamanne/pythonVSCode/issues/1115)
108+
* Fix to empty brackets being added [#1110](https://github.com/DonJayamanne/pythonVSCode/issues/1110), [#1031](https://github.com/DonJayamanne/pythonVSCode/issues/1031)
109+
* Fix debugging of Django applications [#819](https://github.com/DonJayamanne/pythonVSCode/issues/819), [#999](https://github.com/DonJayamanne/pythonVSCode/issues/999)
110+
* Update isort to the latest version [#1134](https://github.com/DonJayamanne/pythonVSCode/issues/1134), [#1135](https://github.com/DonJayamanne/pythonVSCode/pull/1135)
111+
* Fix issue causing intellisense and similar functionality to stop working [#1072](https://github.com/DonJayamanne/pythonVSCode/issues/1072), [#1118](https://github.com/DonJayamanne/pythonVSCode/pull/1118), [#1089](https://github.com/DonJayamanne/pythonVSCode/issues/1089)
112+
* Bunch of unit tests and code cleanup
113+
* Resolve issue where navigation to decorated function goes to decorator [#742](https://github.com/DonJayamanne/pythonVSCode/issues/742)
114+
* Go to symbol in workspace leads to nonexisting files [#816](https://github.com/DonJayamanne/pythonVSCode/issues/816), [#829](https://github.com/DonJayamanne/pythonVSCode/issues/829)
115115

116116
## Source
117117

118-
[GitHub](https://github.com/DonJayamanne/pythonVSCode)
118+
[GitHub](https://github.com/microsoft/vscode-python)
119+
119120

120-
121121
## License
122122

123-
[MIT](https://raw.githubusercontent.com/DonJayamanne/pythonVSCode/master/LICENSE)
123+
[MIT](https://raw.githubusercontent.com/microsoft/vscode-python/master/LICENSE)
124+
125+
126+
## Data/Telemetry
127+
The Microsoft Python Extension for Visual Studio Code collects usage
128+
data and sends it to Microsoft to help improve our products and
129+
services. Read our
130+
[privacy statement](https://privacy.microsoft.com/privacystatement) to
131+
learn more. This extension respects the `telemetry.enableTelemetry`
132+
setting which you can learn more about at
133+
https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting.

0 commit comments

Comments
 (0)