Skip to content

Commit

Permalink
tests: fix regex to include build numbers (#1099)
Browse files Browse the repository at this point in the history
  • Loading branch information
henryiii authored Nov 30, 2023
1 parent a129ac9 commit 038361e
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ sudo PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install PACKAGE
| `~/.local/pipx/venvs` | `platformdirs.user_data_dir()/pipx/venv` |
| `~/.local/pipx/.cache` | `platformdirs.user_cache_dir()/pipx` |
| `~/.local/pipx/logs` | `platformdirs.user_log_dir()/pipx/log` |
`user_data_dir()`, `user_cache_dir()` and `user_log_dir()` resolve to appropriate platform-specific user data, cache and log directories.

`user_data_dir()`, `user_cache_dir()` and `user_log_dir()` resolve to appropriate platform-specific user data, cache and log directories.
See the [platformdirs documentation](https://platformdirs.readthedocs.io/en/latest/api.html#platforms) for details.

## Upgrade pipx
Expand Down
4 changes: 2 additions & 2 deletions docs/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ rm -rf test_venv
## Pipx files not in expected locations according to documentation

The default PIPX_HOME is `~/.local/pipx`, prior to the adoption of the XDG base
directory specification after version 1.2.0. To maintain compatibility with older
directory specification after version 1.2.0. To maintain compatibility with older
versions, pipx will automatically detect the old paths and use them accordingly.
For a map of old and new paths, See [Installation](installation.md#installation-options)

To migrate from the old path to the new path, you can remove the `~/.local/pipx` directory and
To migrate from the old path to the new path, you can remove the `~/.local/pipx` directory and
reinstall all packages.

For example, on Linux systems, you could read out `pipx`'s package information in JSON via `jq` (which you might need to install first):
Expand Down
3 changes: 2 additions & 1 deletion scripts/list_test_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ def create_test_packages_list(
all_packages = []
for downloaded_filename in downloaded_list:
wheel_re = re.search(
r"(.+)\-([^-]+)\-([^-]+)\-([^-]+)\-([^-]+)\.whl$", downloaded_filename
r"([^-]+)\-([^-]+)\-([^-]+)\-([^-]+)\-([^-]+)(-[^-]+)?\.whl$",
downloaded_filename,
)
src_re = re.search(r"(.+)\-([^-]+)\.(?:tar.gz|zip)$", downloaded_filename)
if wheel_re:
Expand Down
2 changes: 1 addition & 1 deletion testdata/tests_packages/macos21-python3.7.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ attrs==22.1.0
awscli==1.18.168
backcall==0.2.0
beautifulsoup4==4.11.1
black-22.10.0==1fixedarch
black==22.10.0
black==22.8.0
bleach==5.0.1
boto3==1.26.20
Expand Down
2 changes: 1 addition & 1 deletion testdata/tests_packages/macos21-python3.8.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ attrs==22.1.0
awscli==1.18.168
backcall==0.2.0
beautifulsoup4==4.11.1
black-22.10.0==1fixedarch
black==22.10.0
black==22.8.0
bleach==5.0.1
boto3==1.26.20
Expand Down

0 comments on commit 038361e

Please sign in to comment.