Skip to content

Commit 69c100a

Browse files
eleanorjboydeleanorjboyd
authored
Merge pull request #7 from eleanorjboyd/fix-main
fix main
2 parents 9f67fbe + ed06e55 commit 69c100a

File tree

46 files changed

+2570
-930
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2570
-930
lines changed

‎.vscode/launch.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,15 @@
253253
"request": "attach",
254254
"listen": { "host": "localhost", "port": 5678 },
255255
"justMyCode": true
256+
},
257+
{
258+
"name": "Debug pytest plugin tests",
259+
260+
"type": "python",
261+
"request": "launch",
262+
"module": "pytest",
263+
"args": ["${workspaceFolder}/pythonFiles/tests/pytestadapter"],
264+
"justMyCode": true
256265
}
257266
],
258267
"compounds": [

‎package-lock.json

Lines changed: 683 additions & 718 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 39 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -83,33 +83,33 @@
8383
"walkthroughs": [
8484
{
8585
"id": "pythonWelcome",
86-
"title": "Get Started with Python Development",
87-
"description": "Your first steps to set up a Python project with all the powerful tools and features that the Python extension has to offer!",
86+
"title": "%walkthrough.pythonWelcome.title%",
87+
"description": "%walkthrough.pythonWelcome.description%",
8888
"when": "workspacePlatform != webworker",
8989
"steps": [
9090
{
9191
"id": "python.createPythonFile",
92-
"title": "Create a Python file",
93-
"description": "[Open](command:toSide:workbench.action.files.openFile) or [create](command:toSide:workbench.action.files.newUntitledFile?%7B%22languageId%22%3A%22python%22%7D) a Python file - make sure to save it as \".py\".\n[Create Python File](command:toSide:workbench.action.files.newUntitledFile?%7B%22languageId%22%3A%22python%22%7D)",
92+
"title": "%walkthrough.step.python.createPythonFile.title%",
93+
"description": "%walkthrough.step.python.createPythonFile.description%",
9494
"media": {
9595
"svg": "resources/walkthrough/open-folder.svg",
96-
"altText": "Open a Python file or a folder with a Python project."
96+
"altText": "%walkthrough.step.python.createPythonFile.altText%"
9797
},
9898
"when": ""
9999
},
100100
{
101101
"id": "python.installPythonWin8",
102-
"title": "Install Python",
103-
"description": "The Python Extension requires Python to be installed. Install Python [from python.org](https://www.python.org/downloads).\n\n[Install Python](https://www.python.org/downloads)\n",
102+
"title": "%walkthrough.step.python.installPythonWin8.title%",
103+
"description": "%walkthrough.step.python.installPythonWin8.description%",
104104
"media": {
105105
"markdown": "resources/walkthrough/install-python-windows-8.md"
106106
},
107107
"when": "workspacePlatform == windows && showInstallPythonTile"
108108
},
109109
{
110110
"id": "python.installPythonMac",
111-
"title": "Install Python",
112-
"description": "The Python Extension requires Python to be installed. Install Python 3 through the terminal.\n[Install Python via Brew](command:python.installPythonOnMac)\n",
111+
"title": "%walkthrough.step.python.installPythonMac.title%",
112+
"description": "%walkthrough.step.python.installPythonMac.description%",
113113
"media": {
114114
"markdown": "resources/walkthrough/install-python-macos.md"
115115
},
@@ -118,8 +118,8 @@
118118
},
119119
{
120120
"id": "python.installPythonLinux",
121-
"title": "Install Python",
122-
"description": "The Python Extension requires Python to be installed. Install Python 3 through the terminal.\n[Install Python via terminal](command:python.installPythonOnLinux)\n",
121+
"title": "%walkthrough.step.python.installPythonLinux.title%",
122+
"description": "%walkthrough.step.python.installPythonLinux.description%",
123123
"media": {
124124
"markdown": "resources/walkthrough/install-python-linux.md"
125125
},
@@ -128,40 +128,40 @@
128128
},
129129
{
130130
"id": "python.selectInterpreter",
131-
"title": "Select a Python Interpreter",
132-
"description": "Choose which Python interpreter/environment you want to use for your Python project.\n[Select Python Interpreter](command:python.setInterpreter)\n**Tip**: Run the ``Python: Select Interpreter`` command in the [Command Palette](command:workbench.action.showCommands).",
131+
"title": "%walkthrough.step.python.selectInterpreter.title%",
132+
"description": "%walkthrough.step.python.selectInterpreter.description%",
133133
"media": {
134134
"svg": "resources/walkthrough/python-interpreter.svg",
135-
"altText": "Selecting a python interpreter from the status bar"
135+
"altText": "%walkthrough.step.python.selectInterpreter.altText%"
136136
},
137137
"when": "workspaceFolderCount == 0"
138138
},
139139
{
140140
"id": "python.createEnvironment",
141-
"title": "Create a Python Environment ",
142-
"description": "Create an environment for your Python project.\n[Create Environment](command:python.createEnvironment)\n**Tip**: Run the ``Python: Create Environment`` command in the [Command Palette](command:workbench.action.showCommands).\n 🔍 Check out our [docs](https://aka.ms/pythonenvs) to learn more.",
141+
"title": "%walkthrough.step.python.createEnvironment.title%",
142+
"description": "%walkthrough.step.python.createEnvironment.description%",
143143
"media": {
144144
"svg": "resources/walkthrough/create-environment.svg",
145-
"altText": "Creating a Python environment from the Command Palette"
145+
"altText": "%walkthrough.step.python.createEnvironment.altText%"
146146
},
147147
"when": "workspaceFolderCount > 0"
148148
},
149149
{
150150
"id": "python.runAndDebug",
151-
"title": "Run and debug your Python file",
152-
"description": "Open your Python file and click on the play button on the top right of the editor, or press F5 when on the file and select \"Python File\" to run with the debugger. \n \n[Learn more](https://code.visualstudio.com/docs/python/python-tutorial#_run-hello-world)",
151+
"title": "%walkthrough.step.python.runAndDebug.title%",
152+
"description": "%walkthrough.step.python.runAndDebug.description%",
153153
"media": {
154154
"svg": "resources/walkthrough/rundebug2.svg",
155-
"altText": "How to run and debug in VS Code with F5 or the play button on the top right."
155+
"altText": "%walkthrough.step.python.runAndDebug.altText%"
156156
},
157157
"when": ""
158158
},
159159
{
160160
"id": "python.learnMoreWithDS",
161-
"title": "Explore more resources",
162-
"description": "🎨 Explore all the features the Python extension has to offer by looking for \"Python\" in the [Command Palette](command:workbench.action.showCommands). \n 📈 Learn more about getting started with [data science](command:workbench.action.openWalkthrough?%7B%22category%22%3A%22ms-python.python%23pythonDataScienceWelcome%22%2C%22step%22%3A%22ms-python.python%23python.createNewNotebook%22%7D) in Python. \n ✨ Take a look at our [Release Notes](https://aka.ms/AA8dxtb) to learn more about the latest features. \n \n[Learn More](https://aka.ms/AA8dqti)",
161+
"title": "%walkthrough.step.python.learnMoreWithDS.title%",
162+
"description": "%walkthrough.step.python.learnMoreWithDS.description%",
163163
"media": {
164-
"altText": "Image representing our documentation page and mailing list resources.",
164+
"altText": "%walkthrough.step.python.learnMoreWithDS.altText%",
165165
"svg": "resources/walkthrough/learnmore.svg"
166166
},
167167
"when": ""
@@ -170,26 +170,26 @@
170170
},
171171
{
172172
"id": "pythonDataScienceWelcome",
173-
"title": "Get Started with Python for Data Science",
174-
"description": "Your first steps to getting started with a Data Science project with Python!",
173+
"title": "%walkthrough.pythonDataScienceWelcome.title%",
174+
"description": "%walkthrough.pythonDataScienceWelcome.description%",
175175
"when": "false",
176176
"steps": [
177177
{
178178
"id": "python.installJupyterExt",
179-
"title": "Install Jupyter extension",
180-
"description": "If you haven't already, install the [Jupyter extension](command:workbench.extensions.search?\"ms-toolsai.jupyter\") to take full advantage of notebooks experiences in VS Code!\n \n[Search Jupyter extension](command:workbench.extensions.search?\"ms-toolsai.jupyter\")",
179+
"title": "%walkthrough.step.python.installJupyterExt.title%",
180+
"description": "%walkthrough.step.python.installJupyterExt.description%",
181181
"media": {
182182
"svg": "resources/walkthrough/data-science.svg",
183-
"altText": "Creating a new Jupyter notebook"
183+
"altText": "%walkthrough.step.python.installJupyterExt.altText%"
184184
}
185185
},
186186
{
187187
"id": "python.createNewNotebook",
188-
"title": "Create or open a Jupyter Notebook",
189-
"description": "Right click in the file explorer and create a new file with an .ipynb extension. Or, open the [Command Palette](command:workbench.action.showCommands) and run the command \n``Jupyter: Create New Blank Notebook``.\n[Create new Jupyter Notebook](command:toSide:jupyter.createnewnotebook)\n If you have an existing project, you can also [open a folder](command:workbench.action.files.openFolder) and/or clone a project from GitHub: [clone a Git repository](command:git.clone).",
188+
"title": "%walkthrough.step.python.createNewNotebook.title%",
189+
"description": "%walkthrough.step.python.createNewNotebook.description%",
190190
"media": {
191191
"svg": "resources/walkthrough/create-notebook.svg",
192-
"altText": "Creating a new Jupyter notebook"
192+
"altText": "%walkthrough.step.python.createNewNotebook.altText%"
193193
},
194194
"completionEvents": [
195195
"onCommand:jupyter.createnewnotebook",
@@ -199,23 +199,23 @@
199199
},
200200
{
201201
"id": "python.openInteractiveWindow",
202-
"title": "Open the Python Interactive Window",
203-
"description": "The Python Interactive Window is a Python shell where you can execute and view the results of your Python code. You can create cells on a Python file by typing ``#%%``.\n \nTo open the interactive window anytime, open the [Command Palette](command:workbench.action.showCommands) and run the command \n``Jupyter: Create Interactive Window``.\n[Open Interactive Window](command:jupyter.createnewinteractive)",
202+
"title": "%walkthrough.step.python.openInteractiveWindow.title%",
203+
"description": "%walkthrough.step.python.openInteractiveWindow.description%",
204204
"media": {
205205
"svg": "resources/walkthrough/interactive-window.svg",
206-
"altText": "Opening python interactive window"
206+
"altText": "%walkthrough.step.python.openInteractiveWindow.altText%"
207207
},
208208
"completionEvents": [
209209
"onCommand:jupyter.createnewinteractive"
210210
]
211211
},
212212
{
213213
"id": "python.dataScienceLearnMore",
214-
"title": "Find out more!",
215-
"description": "📒 Take a look into the [Jupyter extension](command:workbench.extensions.search?\"ms-toolsai.jupyter\") features, by looking for \"Jupyter\" in the [Command Palette](command:workbench.action.showCommands). \n 🏃🏻 Find out more features in our [Tutorials](https://aka.ms/AAdjzpd). \n[Learn more](https://aka.ms/AAdar6q)",
214+
"title": "%walkthrough.step.python.dataScienceLearnMore.title%",
215+
"description": "%walkthrough.step.python.dataScienceLearnMore.description%",
216216
"media": {
217217
"svg": "resources/walkthrough/learnmore.svg",
218-
"altText": "Image representing our documentation page and mailing list resources."
218+
"altText": "%walkthrough.step.python.dataScienceLearnMore.altText%"
219219
}
220220
}
221221
]
@@ -1841,7 +1841,7 @@
18411841
},
18421842
"dependencies": {
18431843
"@iarna/toml": "^2.2.5",
1844-
"@vscode/extension-telemetry": "^0.7.4-preview",
1844+
"@vscode/extension-telemetry": "^0.7.7",
18451845
"@vscode/jupyter-lsp-middleware": "^0.2.50",
18461846
"arch": "^2.1.0",
18471847
"diff-match-patch": "^1.0.0",
@@ -1899,6 +1899,7 @@
18991899
"@types/tmp": "^0.0.33",
19001900
"@types/uuid": "^8.3.4",
19011901
"@types/vscode": "^1.75.0",
1902+
"@vscode/vsce": "^2.18.0",
19021903
"@types/which": "^2.0.1",
19031904
"@types/winreg": "^1.2.30",
19041905
"@types/xml2js": "^0.4.2",
@@ -1947,7 +1948,6 @@
19471948
"typemoq": "^2.1.0",
19481949
"typescript": "4.5.5",
19491950
"uuid": "^8.3.2",
1950-
"vsce": "^2.6.6",
19511951
"vscode-debugadapter-testsupport": "^1.27.0",
19521952
"webpack": "^5.76.0",
19531953
"webpack-bundle-analyzer": "^4.5.0",
@@ -1957,10 +1957,5 @@
19571957
"webpack-node-externals": "^3.0.0",
19581958
"webpack-require-from": "^1.8.6",
19591959
"yargs": "^15.3.1"
1960-
},
1961-
"__metadata": {
1962-
"id": "f1f59ae4-9318-4f3c-a9b5-81b2eaa5f8a5",
1963-
"publisherDisplayName": "Microsoft",
1964-
"publisherId": "998b010b-e2af-44a5-a6cd-0b5fd3b9b6f8"
19651960
}
19661961
}

0 commit comments

Comments
 (0)