From d4a6d3eeeec27483232f2db26080b164b2a8a69b Mon Sep 17 00:00:00 2001 From: Frost Ming Date: Wed, 30 Jun 2021 10:47:19 +0800 Subject: [PATCH 1/2] Add install instructions for scoop --- README.md | 7 +++++++ README_zh.md | 9 ++++++++- docs/docs/index.md | 7 +++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c5af9489e5..4c4aaba175 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,13 @@ If you are on MacOS and using `homebrew`, install it by: $ brew install pdm ``` +If you are on Windows and using [Scoop](https://scoop.sh/), install it by: + +``` +PS> scoop bucket add frostming https://github.com/frostming/scoop-frostming.git +PS> scoop install pdm +``` + Otherwise, it is recommended to install `pdm` in an isolated environment with `pipx`: ```bash diff --git a/README_zh.md b/README_zh.md index 6eb31a8be9..9545f9197c 100644 --- a/README_zh.md +++ b/README_zh.md @@ -102,12 +102,19 @@ optional arguments: ## 其他安装方法 -如果你使用的是 MacOS 并且安装了 `homebrew`: +如果你使用的是 MacOS 并且安装了 `homebrew`： ```bash $ brew install pdm ``` +如果你在Windows上使用 [Scoop](https://scoop.sh/), 运行以下命令安装： + +``` +PS> scoop bucket add frostming https://github.com/frostming/scoop-frostming.git +PS> scoop install pdm +``` + 否则，强烈推荐把 `pdm` 安装在一个隔离环境中， 用 `pipx` 是坠吼的。 ```bash diff --git a/docs/docs/index.md b/docs/docs/index.md index fdea234d44..2019f80f6b 100644 --- a/docs/docs/index.md +++ b/docs/docs/index.md @@ -75,6 +75,13 @@ If your are on MacOS and using `homebrew`, install it by: $ brew install pdm ``` +If you are on Windows and using [Scoop](https://scoop.sh/), install it by: + +``` +PS> scoop bucket add frostming https://github.com/frostming/scoop-frostming.git +PS> scoop install pdm +``` + Otherwise, to avoid messing up with the system Python environment, the most recommended way to install PDM is via [pipx](https://pypi.org/project/pipx): From fcda87684fa686f7859b97b2656edd2829c6709b Mon Sep 17 00:00:00 2001 From: Frost Ming Date: Wed, 30 Jun 2021 10:50:04 +0800 Subject: [PATCH 2/2] add news entry --- news/522.bugfix.md | 1 + news/522.doc.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 news/522.bugfix.md create mode 100644 news/522.doc.md diff --git a/news/522.bugfix.md b/news/522.bugfix.md new file mode 100644 index 0000000000..fdf288c9b7 --- /dev/null +++ b/news/522.bugfix.md @@ -0,0 +1 @@ +Fix the path manipulation on Windows, now the PEP 582 path is prepended to the `PYTHONPATH`. diff --git a/news/522.doc.md b/news/522.doc.md new file mode 100644 index 0000000000..4f49718ae3 --- /dev/null +++ b/news/522.doc.md @@ -0,0 +1 @@ +Add installation instructions for Scoop.