Bump linters and release 0.16.5 (#751)

gaborbernat · web-flow · commit ffa4e2aed32f · 2021-12-25T14:02:15.000Z
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -11,4 +11,4 @@ about: Suggest an idea or new feature for this project
 <!-- If you have an idea of how to do this, write it here! -->
 
 **Describe alternatives you've considered**
-<!-- If there's some workaround or alternative solutions, let us know. -->
+<!-- If there's some workaround or alternative solutions, let us know. -->
diff --git a/.github/workflows/create_tests_package_lists.yml b/.github/workflows/create_tests_package_lists.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
@@ -14,7 +14,7 @@ on:
 
 # If changing default-python be sure to change job "tests" matrix: include: also
 env:
-  default-python: 3.9
+  default-python: "3.10"
 
 jobs:
   lint:
@@ -52,14 +52,15 @@ jobs:
   tests:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
         include:
           - os: windows-latest
-            python-version: 3.9
+            python-version: "3.10"
           - os: macos-latest
-            python-version: 3.9
+            python-version: "3.10"
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.github/workflows/publish-testpypi.yml b/.github/workflows/publish-testpypi.yml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 env:
-  default-python: 3.9
+  default-python: "3.10"
 
 jobs:
   testpypi-publish:
diff --git a/.github/workflows/publish_docs.yml b/.github/workflows/publish_docs.yml
@@ -5,7 +5,7 @@ on:
     types: [published]
 
 env:
-  default-python: 3.9
+  default-python: "3.10"
 
 jobs:
   build:
diff --git a/.github/workflows/test_all_packages_slow.yml b/.github/workflows/test_all_packages_slow.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ __pycache__
 site
 docs/docs.md
 .pipx_tests
+/.coverage*
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,27 +6,27 @@
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.0.0
+  rev: v4.0.1
   hooks:
   - id: end-of-file-fixer
   - id: check-added-large-files
   #- id: trailing-whitespace
   #- id: check-yaml
-- repo: https://github.com/timothycrosley/isort
-  rev: 5.8.0
+- repo: https://github.com/PyCQA/isort
+  rev: 5.10.1
   hooks:
   - id: isort
     args: ['--profile','black']
 - repo: https://github.com/psf/black
-  rev: 21.5b1
+  rev: 21.12b0
   hooks:
   - id: black
-- repo: https://gitlab.com/pycqa/flake8
-  rev: 3.9.2
+- repo: https://gitlab.com/PyCQA/flake8
+  rev: 4.0.1
   hooks:
   - id: flake8
     additional_dependencies: [
-        'flake8-bugbear==20.11.1'
+        'flake8-bugbear==21.11.29'
     ]
 # mypy args:
 #   must include --ignore-missing-imports for mypy.  It is included by default
@@ -35,7 +35,8 @@ repos:
 #   cannot use --warn-unused-ignores because it conflicts with
 #     --ignore-missing-imports
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.812
+  rev: v0.930
   hooks:
   - id: mypy
     args: ['--ignore-missing-imports', '--strict-equality','--no-implicit-optional']
+    exclude: 'testdata/test_package_specifier/local_extras/setup.py'
diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -19,4 +19,4 @@ Or you can run a program without installing it:
 pipx run pycowsay moooo!
 ```
 
-You can view documentation for all commands by running `pipx --help`.
+You can view documentation for all commands by running `pipx --help`.
diff --git a/noxfile.py b/noxfile.py
@@ -4,17 +4,18 @@
 
 import nox  # type: ignore
 
-PYTHON_ALL_VERSIONS = ["3.6", "3.7", "3.8", "3.9"]
-PYTHON_DEFAULT_VERSION = "3.9"
+PYTHON_ALL_VERSIONS = ["3.6", "3.7", "3.8", "3.9", "3.10"]
+PYTHON_DEFAULT_VERSION = "3.10"
 DOC_DEPENDENCIES = [".", "jinja2", "mkdocs", "mkdocs-material"]
 LINT_DEPENDENCIES = [
-    "black==21.5b1",
-    "flake8==3.9.2",
-    "flake8-bugbear==21.3.2",
-    "mypy==0.812",
-    "check-manifest==0.46",
+    "black==21.12b0",
+    "flake8==4.0.1",
+    "flake8-bugbear==21.11.29",
+    "mypy==0.930",
+    "types-jinja2",
+    "check-manifest==0.47",
     "packaging>=20.0",
-    "isort==5.8.0",
+    "isort==5.10.1",
 ]
 # Packages whose dependencies need an intact system PATH to compile
 # pytest setup clears PATH.  So pre-build some wheels to the pip cache.
diff --git a/src/pipx/commands/install.py b/src/pipx/commands/install.py
@@ -35,7 +35,7 @@ def install(
         venv_dir = venv_container.get_venv_dir(f"{package_name}{suffix}")
 
     try:
-        exists = venv_dir.exists() and next(venv_dir.iterdir())
+        exists = venv_dir.exists() and bool(next(venv_dir.iterdir()))
     except StopIteration:
         exists = False
 
diff --git a/src/pipx/commands/reinstall.py b/src/pipx/commands/reinstall.py
@@ -27,7 +27,11 @@ def reinstall(
         print(f"Nothing to reinstall for {venv_dir.name} {sleep}")
         return EXIT_CODE_REINSTALL_VENV_NONEXISTENT
 
-    if Path(python).is_relative_to(venv_dir):
+    try:
+        Path(python).relative_to(venv_dir)
+    except ValueError:
+        pass
+    else:
         print(
             f"{error} Error, the python executable would be deleted!",
             "Change it using the --python option or PIPX_DEFAULT_PYTHON environment variable.",
diff --git a/src/pipx/constants.py b/src/pipx/constants.py
@@ -1,4 +1,5 @@
 import os
+import sys
 from pathlib import Path
 from textwrap import dedent
 from typing import NewType, Optional
@@ -33,12 +34,7 @@
 
 
 def is_windows() -> bool:
-    try:
-        WindowsError  # noqa
-    except NameError:
-        return False
-    else:
-        return True
+    return sys.platform == "win32"
 
 
 WINDOWS: bool = is_windows()
diff --git a/src/pipx/util.py b/src/pipx/util.py
@@ -119,7 +119,6 @@ def get_venv_paths(root: Path) -> Tuple[Path, Path]:
         python_path = bin_path / "python.exe"
         return bin_path, python_path
 
-
 else:
 
     def get_venv_paths(root: Path) -> Tuple[Path, Path]:
@@ -244,7 +243,7 @@ def analyze_pip_output(pip_stdout: str, pip_stderr: str) -> None:
     """
     max_relevant_errors = 10
 
-    failed_build_stdout = []
+    failed_build_stdout: List[str] = []
     last_collecting_dep: Optional[str] = None
     # for any useful information in stdout, `pip install` must be run without
     #   the -q option
diff --git a/src/pipx/venv.py b/src/pipx/venv.py
@@ -94,7 +94,7 @@ def __init__(
         self.verbose = verbose
         self.do_animation = not verbose
         try:
-            self._existing = self.root.exists() and next(self.root.iterdir())
+            self._existing = self.root.exists() and bool(next(self.root.iterdir()))
         except StopIteration:
             self._existing = False
 
diff --git a/src/pipx/version.py b/src/pipx/version.py
@@ -1,2 +1,2 @@
-__version_info__ = (0, 16, 5, 1, "dev0")
+__version_info__ = (0, 16, 5)
 __version__ = ".".join(str(i) for i in __version_info__)
diff --git a/testdata/tests_packages/macos20-python3.9.txt b/testdata/tests_packages/macos20-python3.9.txt
@@ -75,7 +75,7 @@ jupyter_console==6.4.0
 jupyter_core==4.7.1
 jupyterlab_pygments==0.1.2
 jupyterlab_widgets==1.0.0
-kaggle==1.5.9
+kaggle==1.5.12
 keyring==23.0.1
 keyrings.alt==4.0.2
 lazy_object_proxy==1.6.0
