aboutsummaryrefslogtreecommitdiffstats
path: root/pydis_site
diff options
context:
space:
mode:
authorGravatar discretegames <[email protected]>2022-11-08 03:18:27 -0800
committerGravatar discretegames <[email protected]>2022-11-08 03:18:27 -0800
commitee5e1ba623c05f26436ddc08ea46fcd26ddbdd55 (patch)
tree93a01fc09a678b397dbda2c829ce415b3ed1d94b /pydis_site
parentfinished py launcher section, finishing Windows guide reorg (diff)
Added WSL2 section to windows guide; other tweaks
Diffstat (limited to 'pydis_site')
-rw-r--r--pydis_site/apps/content/resources/guides/python-guides/windows/installing-and-using-python.md11
-rw-r--r--pydis_site/apps/content/resources/guides/python-guides/windows/microsoft-store.md4
-rw-r--r--pydis_site/apps/content/resources/guides/python-guides/windows/unix-env-on-windows.md36
3 files changed, 36 insertions, 15 deletions
diff --git a/pydis_site/apps/content/resources/guides/python-guides/windows/installing-and-using-python.md b/pydis_site/apps/content/resources/guides/python-guides/windows/installing-and-using-python.md
index 04670c03..86a2e571 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/windows/installing-and-using-python.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/windows/installing-and-using-python.md
@@ -65,8 +65,8 @@ Windows 11 or other modern versions of Python.)
### Checking that it Worked
-To test that installing Python worked, you can do what it suggests and search "python" on the Start Menu to find the Python console app
-and run some code like `print("Hello, World!")`.
+To test that installing Python worked, you can do what it suggests and search "python" on the Start Menu to find the
+Python console app and run some code like `print("Hello, World!")`.
[![Testing Python console](/static/images/content/python-on-windows/recommended_install_7.png)](/static/images/content/python-on-windows/recommended_install_7.png)
@@ -189,13 +189,14 @@ install [NumPy](https://numpy.org/) into Python 3.7.
If you want can always use `py` instead of `python` and not have any Python versions on the Windows Path at all (check
out [this guide](<(../putting-python-on-path)>) to learn about the Windows Path). Though, once in a while third party
software may want to invoke `python`, so keeping it on the Path is handy. We recommend having your "main" Python version
-on the Path so you can invoke it with `python`, and then using `py -X.Y` whenever you want a different version, e.g. `py -3.10`.
+on the Path so you can invoke it with `python`, and then using `py -X.Y` whenever you want a different version, e.g.
+`py -3.7`.
The official documentation of the `py launcher` can be found
[here](https://docs.python.org/3/using/windows.html#python-launcher-for-windows).
-The py launcher is not available on Unix-based platforms such as macOS, but there is [an unofficial version by Brett
-Cannon](https://github.com/brettcannon/python-launcher).
+The py launcher is not available on GNU/Linux-based platforms such as macOS, but there is [an unofficial version by
+Brett Cannon](https://github.com/brettcannon/python-launcher).
## Virtual Environments
diff --git a/pydis_site/apps/content/resources/guides/python-guides/windows/microsoft-store.md b/pydis_site/apps/content/resources/guides/python-guides/windows/microsoft-store.md
index 9620c09f..89f11787 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/windows/microsoft-store.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/windows/microsoft-store.md
@@ -12,8 +12,8 @@ Store](https://apps.microsoft.com/store/search/python) as an alternative to usin
python.org](https://www.python.org/downloads). **We recommend you install Python on Windows using the [full installer
from python.org](https://www.python.org/downloads), and not from the Microsoft store wherever possible!**
-You can follow [this guide to install Python from python.org](../installing-and-using-python) and more Python Windows releases
-can be found [here](https://www.python.org/downloads/windows).
+You can follow [this guide to install Python from python.org](../installing-and-using-python) and more Python Windows
+releases can be found [here](https://www.python.org/downloads/windows).
Here are some common issues with using Python from the Microsoft Store:
diff --git a/pydis_site/apps/content/resources/guides/python-guides/windows/unix-env-on-windows.md b/pydis_site/apps/content/resources/guides/python-guides/windows/unix-env-on-windows.md
index 47f2138e..a17de183 100644
--- a/pydis_site/apps/content/resources/guides/python-guides/windows/unix-env-on-windows.md
+++ b/pydis_site/apps/content/resources/guides/python-guides/windows/unix-env-on-windows.md
@@ -1,6 +1,6 @@
---
-title: Setting up a Unix-Style Python Environment on Windows
-description: How to setup a Unix-style Python environment ready to start coding in
+title: Setting up a Unix-Style Python Environment
+description: How to setup a Unix-style Python environment on Windows ready to start coding in
icon: fab fa-windows
---
@@ -28,11 +28,11 @@ simpler interface. Other editors we recommend can be found [here](https://python
## Installing Git Bash
-Git is a command line program that helps you keep track of changes to your code, among other things. Many developers use
-it, and while you may not need it right away, it is useful to install it because it comes with Git Bash. On the "Select
-Components" screen, no settings need to be changed. The next screen will ask what text editor you want to use with Git.
-Vim is the default choice, though Vim is widely considered difficult to learn, so you may choose to select Notepad++ or
-whichever text editor you may have installed previously.
+[Git](https://git-scm.com/downloads) is a command line program that helps you keep track of changes to your code, among
+other things. Many developers use it, and while you may not need it right away, it is useful to install it because it
+comes with Git Bash. On the "Select Components" screen, no settings need to be changed. The next screen will ask what
+text editor you want to use with Git. Vim is the default choice, though Vim is widely considered difficult to learn, so
+you may choose to select Notepad++ or whichever text editor you may have installed previously.
For all remaining screens in the installation, the default selections are fine.
@@ -69,4 +69,24 @@ desktop, `cd /c/Users/YourUsername/Desktop` will take you there. Otherwise if yo
explorer, you can right click anywhere in the white space of the file explorer window (not on top of a file) and select
"Git Bash Here". Once you're there, type `python hello.py`, and the program will run.
-<!-- dg:TODO? Mention WSL2? -->
+## WSL
+
+[WSL (Windows Subsystem for Linux)](https://learn.microsoft.com/en-us/windows/wsl/about) is another increasingly common
+way to set up a GNU/Linux-style environment on Windows. It effectively emulates a Linux distribution on Windows,
+complete with command line utilities, that you can use alongside your normal Windows programs. (Technically WSL is a
+[compatibility layer](https://en.wikipedia.org/wiki/Compatibility_layer), not en emulator.)
+
+To set up WSL, check out [this installation guide from
+Microsoft](https://learn.microsoft.com/en-us/windows/wsl/install). They also have an
+[FAQ](https://learn.microsoft.com/en-us/windows/wsl/faq) and a [best practices for using WSL in a development
+environment](https://learn.microsoft.com/en-us/windows/wsl/setup/environment). The
+[part](https://learn.microsoft.com/en-us/windows/wsl/setup/environment#set-up-windows-terminal) about getting [Windows
+Terminal](https://apps.microsoft.com/store/detail/windows-terminal/9N0DX20HK701) is particularly good advice as it lets
+you use one app for all your terminals.
+
+Also check out these guide for using WSL [with VSCode](https://code.visualstudio.com/docs/remote/wsl) and [with
+PyCharm](https://www.jetbrains.com/help/pycharm/using-wsl-as-a-remote-interpreter.html).
+
+(You may have heard of WSL2 specifically. That is now the default and
+[recommended](https://learn.microsoft.com/en-us/windows/wsl/compare-versions) version. If someone says "WSL" they're
+probably talking about WSL2.)